diff --git a/OpenRA.Mods.Common/Traits/Carryable.cs b/OpenRA.Mods.Common/Traits/Carryable.cs
index aa78a5fe98..8f45f29a2b 100644
--- a/OpenRA.Mods.Common/Traits/Carryable.cs
+++ b/OpenRA.Mods.Common/Traits/Carryable.cs
@@ -19,11 +19,11 @@ namespace OpenRA.Mods.Common.Traits
 	{
 		[UpgradeGrantedReference]
 		[Desc("The condition to grant to self while a carryall has been reserved.")]
-		public readonly string ReservedCondition = "carryall-reserved";
+		public readonly string ReservedCondition = null;
 
 		[UpgradeGrantedReference]
 		[Desc("The condition to grant to self while being carried.")]
-		public readonly string CarriedCondition = "carried";
+		public readonly string CarriedCondition = null;
 
 		[Desc("Carryall attachment point relative to body.")]
 		public readonly WVec LocalOffset = WVec.Zero;
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits
 
 			attached = true;
 
-			if (carriedToken == UpgradeManager.InvalidConditionToken)
+			if (carriedToken == UpgradeManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CarriedCondition))
 				carriedToken = upgradeManager.GrantCondition(self, Info.CarriedCondition);
 		}
 
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits
 			state = State.Reserved;
 			Carrier = carrier;
 
-			if (reservedToken == UpgradeManager.InvalidConditionToken)
+			if (reservedToken == UpgradeManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.ReservedCondition))
 				reservedToken = upgradeManager.GrantCondition(self, Info.ReservedCondition);
 
 			return true;
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index dcdaceff41..1c4a8846dc 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -160,6 +160,7 @@
 		VoiceSet: VehicleVoice
 	AutoCarryable:
 		CarriedCondition: notmobile
+		ReservedCondition: carryall-reserved
 	WithDecoration@CARRYALL:
 		Image: pips
 		Sequence: pickup-indicator