diff --git a/OpenRA.Mods.Common/Traits/RepairsBridges.cs b/OpenRA.Mods.Common/Traits/RepairsBridges.cs
index 91659e2165..c3b2dc1d99 100644
--- a/OpenRA.Mods.Common/Traits/RepairsBridges.cs
+++ b/OpenRA.Mods.Common/Traits/RepairsBridges.cs
@@ -95,8 +95,10 @@ namespace OpenRA.Mods.Common.Traits
 				else
 					return;
 
-				self.SetTargetLine(Target.FromOrder(self.World, order), Color.Yellow);
+				if (!order.Queued)
+					self.CancelActivity();
 
+				self.SetTargetLine(Target.FromOrder(self.World, order), Color.Yellow);
 				self.QueueActivity(new RepairBridge(self, order.TargetActor, info.EnterBehaviour, info.RepairNotification));
 			}
 		}