diff --git a/OpenRA.Mods.Common/Traits/Cloak.cs b/OpenRA.Mods.Common/Traits/Cloak.cs
index 9f2bac1920..0a92925b8b 100644
--- a/OpenRA.Mods.Common/Traits/Cloak.cs
+++ b/OpenRA.Mods.Common/Traits/Cloak.cs
@@ -84,7 +84,10 @@ namespace OpenRA.Mods.Common.Traits
 			// The upgrade manager exists, but may not have finished being created yet.
 			// We'll defer the upgrades until the end of the tick, at which point it will be ready.
 			if (Cloaked)
+			{
+				wasCloaked = true;
 				self.World.AddFrameEndTask(_ => GrantUpgrades(self));
+			}
 		}
 
 		public bool Cloaked { get { return !IsTraitDisabled && remainingTime <= 0; } }