diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
index e1a9f767c0..9f2a442430 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -204,8 +204,7 @@ namespace OpenRA.Mods.Common.Traits
 				AttackTarget(order.Target, AttackSource.Default, order.Queued, true, forceAttack, Info.TargetLineColor);
 				self.ShowTargetLines();
 			}
-
-			if (order.OrderString == "Stop")
+			else if (order.OrderString == "Stop")
 				OnStopOrder(self);
 		}