diff --git a/OpenRA.Mods.Common/Traits/AutoCarryall.cs b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
index 17e5b8fc8a..1d02246b67 100644
--- a/OpenRA.Mods.Common/Traits/AutoCarryall.cs
+++ b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
@@ -113,7 +113,8 @@ namespace OpenRA.Mods.Common.Traits
 
 			protected override void OnFirstRun(Actor self)
 			{
-				QueueChild(new PickupUnit(self, cargo, 0));
+				if (!cargo.IsDead)
+					QueueChild(new PickupUnit(self, cargo, 0));
 			}
 
 			public override bool Tick(Actor self)