diff --git a/OpenRA.Mods.Common/Traits/AutoCarryall.cs b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
index c1204aaa60..17e5b8fc8a 100644
--- a/OpenRA.Mods.Common/Traits/AutoCarryall.cs
+++ b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
@@ -118,6 +118,9 @@ namespace OpenRA.Mods.Common.Traits
 
 			public override bool Tick(Actor self)
 			{
+				if (cargo.IsDead)
+					return true;
+
 				var dropRange = self.Trait<Carryall>().Info.DropRange;
 				var destination = cargo.Trait<Carryable>().Destination;
 				if (destination != null)