diff --git a/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs b/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs
index c385c407e3..6c6ed11f0a 100644
--- a/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs
@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		Color GetColor()
 		{
-			return self.EffectiveOwner != null ? self.EffectiveOwner.Owner.Color.RGB : self.Owner.Color.RGB;
+			return self.EffectiveOwner != null && self.EffectiveOwner.Disguised ? self.EffectiveOwner.Owner.Color.RGB : self.Owner.Color.RGB;
 		}
 
 		IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml
index 47b0263077..335a78f22f 100644
--- a/mods/ra/maps/infiltration/rules.yaml
+++ b/mods/ra/maps/infiltration/rules.yaml
@@ -54,9 +54,6 @@ SPY.Strong:
 		Types: MissionObjective
 	ExternalCaptures:
 		CaptureTypes: MissionObjective
-	EditorOnlyTooltip:
-		Description: RenderDebugState.OnOwnerChange will crash
-	-RenderDebugState:
 	Passenger:
 		GrantUpgrades: mobile
 
@@ -187,9 +184,6 @@ STEK:
 MCV:
 	Buildable:
 		Prerequisites: ~disabled
-	EditorOnlyTooltip:
-		Description: RenderDebugState.OnOwnerChange will crash
-	-RenderDebugState:
 
 APC:
 	Buildable: