diff --git a/OpenRA.Mods.Common/Traits/Carryall.cs b/OpenRA.Mods.Common/Traits/Carryall.cs
index 7f5a474e25..561bcc60fd 100644
--- a/OpenRA.Mods.Common/Traits/Carryall.cs
+++ b/OpenRA.Mods.Common/Traits/Carryall.cs
@@ -307,8 +307,7 @@ namespace OpenRA.Mods.Common.Traits
 
 				self.QueueActivity(order.Queued, new DeliverUnit(self, Info.DropRange));
 			}
-
-			if (order.OrderString == "PickupUnit")
+			else if (order.OrderString == "PickupUnit")
 			{
 				if (order.Target.Type != TargetType.Actor)
 					return;