diff --git a/OpenRA.Mods.RA/ChronoshiftDeploy.cs b/OpenRA.Mods.RA/ChronoshiftDeploy.cs
index 9db2c130bb..ad81291890 100644
--- a/OpenRA.Mods.RA/ChronoshiftDeploy.cs
+++ b/OpenRA.Mods.RA/ChronoshiftDeploy.cs
@@ -45,8 +45,9 @@ namespace OpenRA.Mods.RA
 		{
 			if (order.OrderString == "ChronoshiftDeploy")
 			{
-				if (self.Owner == self.World.LocalPlayer)
-					self.World.OrderGenerator = new SetChronoTankDestination(self);
+				if (chargeTick <= 0)
+					if (self.Owner == self.World.LocalPlayer)
+						self.World.OrderGenerator = new SetChronoTankDestination(self);
 				return;
 			}