diff --git a/OpenRA.Mods.Common/Traits/Modifiers/DisabledOverlay.cs b/OpenRA.Mods.Common/Traits/Modifiers/DisabledOverlay.cs
index 0827dccf94..dda9e1e883 100644
--- a/OpenRA.Mods.Common/Traits/Modifiers/DisabledOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Modifiers/DisabledOverlay.cs
@@ -21,11 +21,19 @@ namespace OpenRA.Mods.Common.Traits
 	{
 		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
 		{
-			var disabled = self.IsDisabled();
+			if (!self.IsDisabled())
+				return r;
+
+			return ModifiedRender(self, wr, r);
+		}
+
+		IEnumerable<IRenderable> ModifiedRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
+		{
 			foreach (var a in r)
 			{
 				yield return a;
-				if (disabled && !a.IsDecoration)
+
+				if (!a.IsDecoration)
 					yield return a.WithPalette(wr.Palette("disabled"))
 						.WithZOffset(a.ZOffset + 1)
 						.AsDecoration();
diff --git a/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs b/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
index fb6240d3af..f63ff61856 100644
--- a/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
@@ -32,6 +32,7 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			if (IsTraitDisabled)
 				return r;
+
 			return ModifiedRender(self, wr, r);
 		}