diff --git a/OpenRA.Mods.Common/Activities/WaitForTransport.cs b/OpenRA.Mods.Common/Activities/WaitForTransport.cs
index c217d02485..f1e72cb9fd 100644
--- a/OpenRA.Mods.Common/Activities/WaitForTransport.cs
+++ b/OpenRA.Mods.Common/Activities/WaitForTransport.cs
@@ -18,11 +18,17 @@ namespace OpenRA.Mods.Common.Activities
 	public class WaitForTransport : Activity
 	{
 		readonly ICallForTransport transportable;
+		readonly Activity inner;
 
-		public WaitForTransport(Actor self, Activity innerActivity)
+		public WaitForTransport(Actor self, Activity inner)
 		{
 			transportable = self.TraitOrDefault<ICallForTransport>();
-			QueueChild(self, innerActivity);
+			this.inner = inner;
+		}
+
+		protected override void OnFirstRun(Actor self)
+		{
+			QueueChild(self, inner);
 		}
 
 		public override Activity Tick(Actor self)