diff --git a/OpenRA.Mods.Common/Traits/Passenger.cs b/OpenRA.Mods.Common/Traits/Passenger.cs
index 76781d4610..05ef471e36 100644
--- a/OpenRA.Mods.Common/Traits/Passenger.cs
+++ b/OpenRA.Mods.Common/Traits/Passenger.cs
@@ -158,11 +158,11 @@ namespace OpenRA.Mods.Common.Traits
 			if (!IsCorrectCargoType(targetActor))
 				return;
 
-			self.SetTargetLine(order.Target, Color.Green);
-
-			self.CancelActivity();
+			if (!order.Queued)
+				self.CancelActivity();
 
 			var transports = order.OrderString == "EnterTransports";
+			self.SetTargetLine(order.Target, Color.Green);
 			self.QueueActivity(new EnterTransport(self, targetActor, transports ? Info.MaxAlternateTransportAttempts : 0, !transports));
 		}