diff --git a/OpenRA.Mods.RA/Crates/CloakCrateAction.cs b/OpenRA.Mods.RA/Crates/CloakCrateAction.cs
index 5198e8ad7a..4e01e0723b 100644
--- a/OpenRA.Mods.RA/Crates/CloakCrateAction.cs
+++ b/OpenRA.Mods.RA/Crates/CloakCrateAction.cs
@@ -39,7 +39,12 @@ namespace OpenRA.Mods.RA.Crates
 
 			var cloak = cloakInfo.Create(new ActorInitializer(collector, collector.Location));
 
-			collector.World.AddFrameEndTask(w => collector.traits.Add(cloak));
+			collector.World.AddFrameEndTask(w =>
+				{
+					w.Remove(collector);
+					collector.traits.Add(cloak);
+					w.Add(collector);
+				});
 
 			base.Activate(collector);
 		}
diff --git a/mods/cnc/system.yaml b/mods/cnc/system.yaml
index a0840d0175..9052f6d4e6 100644
--- a/mods/cnc/system.yaml
+++ b/mods/cnc/system.yaml
@@ -157,6 +157,11 @@ CRATE:
 		SelectionShares: 5
 		Effect: hide-map
 	CloakCrateAction:
-		SelectionShares: 1000
+		SelectionShares: 5
+		InitialDelay: .4
+		CloakDelay: 2.0
+		CloakSound: appear1.aud
+		UncloakSound: appear1.aud
+		Effect: stealth
 	RenderUnit:
 	BelowUnits: