diff --git a/OpenRA.Mods.Common/Traits/Cargo.cs b/OpenRA.Mods.Common/Traits/Cargo.cs
index 4bec40371e..29dc1c135c 100644
--- a/OpenRA.Mods.Common/Traits/Cargo.cs
+++ b/OpenRA.Mods.Common/Traits/Cargo.cs
@@ -309,8 +309,10 @@ namespace OpenRA.Mods.Common.Traits
 						upgradeManager.RevokeUpgrade(self, u, this);
 			}
 
-			foreach (var npe in self.TraitsImplementing<INotifyPassengerEntered>())
-				npe.OnPassengerEntered(self, a);
+			// If not initialized then this will be notified in the first tick
+			if (initialized)
+				foreach (var npe in self.TraitsImplementing<INotifyPassengerEntered>())
+					npe.OnPassengerEntered(self, a);
 
 			var p = a.Trait<Passenger>();
 			p.Transport = self;