diff --git a/OpenRA.Mods.Common/Traits/AutoCarryall.cs b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
index 31ea1ba384..66c54c6e6a 100644
--- a/OpenRA.Mods.Common/Traits/AutoCarryall.cs
+++ b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
@@ -192,8 +192,7 @@ namespace OpenRA.Mods.Common.Traits
 					return true;
 
 				var dropRange = carryall.Info.DropRange;
-				if (carryable.Destination != null)
-					QueueChild(new DeliverUnit(self, Target.FromCell(self.World, carryable.Destination.Value), dropRange, carryall.Info.TargetLineColor));
+				QueueChild(new DeliverUnit(self, Target.FromCell(self.World, carryable.Destination ?? self.Location), dropRange, carryall.Info.TargetLineColor));
 
 				return true;
 			}