diff --git a/OpenRA.Mods.RA/Cloak.cs b/OpenRA.Mods.RA/Cloak.cs
index 038d20e55f..8002adee7f 100644
--- a/OpenRA.Mods.RA/Cloak.cs
+++ b/OpenRA.Mods.RA/Cloak.cs
@@ -81,6 +81,8 @@ namespace OpenRA.Mods.RA
 			if (remainingTime > 0 && canCloak)
 				if (--remainingTime <= 0)
 					Sound.Play(info.CloakSound, self.CenterLocation);
+			if (self.IsDisabled())
+				Uncloak();
 		}
 
 		public bool IsVisible(Actor self)