diff --git a/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs b/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
index e7e5af7a6c..8feefc12f3 100644
--- a/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
@@ -29,12 +29,19 @@ namespace OpenRA.Mods.Common.Traits
 			: base(info) { }
 
 		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
+		{
+			if (IsTraitDisabled)
+				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 (!IsTraitDisabled && !a.IsDecoration)
+				if (!a.IsDecoration)
 					yield return a.WithPalette(wr.Palette(Info.Palette))
 						.WithZOffset(a.ZOffset + 1)
 						.AsDecoration();