diff --git a/OpenRA.Mods.Common/Activities/EnterTransport.cs b/OpenRA.Mods.Common/Activities/EnterTransport.cs
index b0b185bc56..c535535250 100644
--- a/OpenRA.Mods.Common/Activities/EnterTransport.cs
+++ b/OpenRA.Mods.Common/Activities/EnterTransport.cs
@@ -55,6 +55,10 @@ namespace OpenRA.Mods.Common.Activities
 			});
 
 			Done(self);
+
+			// Preemptively cancel any activities to avoid an edge-case where successively queued
+			// EnterTransports corrupt the actor state. Activities are cancelled again on unload
+			self.CancelActivity();
 		}
 
 		protected override bool TryGetAlternateTarget(Actor self, int tries, ref Target target)