diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index e07144ac3e..29f1f6ffc7 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -1724,6 +1724,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						var deathType = node.Value.Nodes.FirstOrDefault(n => n.Key == "DeathType");
 						if (deathType == null)
 							node.Value.Nodes.Add(new MiniYamlNode("DeathType", "TiberiumDeath"));
+
+						node.Value.Nodes.Add(new MiniYamlNode("RequiresLobbyCreeps", "true"));
 					}
 
 					if (node.Key == "LeavesHusk")
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 623a5bcab5..1f5acc7847 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -196,6 +196,7 @@
 		OwnerType: InternalName
 		InternalOwner: Creeps
 		DeathType: TiberiumDeath
+		RequiresLobbyCreeps: true
 	Crushable:
 		WarnProbability: 67
 		CrushSound: squish2.aud
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 3d79b978c3..4321134e72 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -262,6 +262,7 @@
 		OwnerType: InternalName
 		InternalOwner: Creeps
 		DeathType: EnergyDeath # TODO: FIX ME! (Tiberium currently uses the wrong damage type!)
+		RequiresLobbyCreeps: true
 	Guard:
 		Voice: Move
 	Guardable: