diff --git a/OpenRA.Mods.RA/Attack/AttackTesla.cs b/OpenRA.Mods.RA/Attack/AttackTesla.cs
index 9a82355851..77f7bba267 100644
--- a/OpenRA.Mods.RA/Attack/AttackTesla.cs
+++ b/OpenRA.Mods.RA/Attack/AttackTesla.cs
@@ -51,6 +51,14 @@ namespace OpenRA.Mods.RA
 			return new TeslaAttack( newTarget );
 		}
 
+		public override void ResolveOrder(Actor self, Order order)
+		{
+			base.ResolveOrder(self, order);
+
+			if (order.OrderString == "Stop")
+				self.CancelActivity();
+		}
+
 		class TeslaAttack : Activity
 		{
 			readonly Target target;