diff --git a/OpenRA.Mods.Common/Traits/RepairableNear.cs b/OpenRA.Mods.Common/Traits/RepairableNear.cs
index 96210aa84a..f3e0a7ca39 100644
--- a/OpenRA.Mods.Common/Traits/RepairableNear.cs
+++ b/OpenRA.Mods.Common/Traits/RepairableNear.cs
@@ -82,7 +82,9 @@ namespace OpenRA.Mods.Common.Traits
 			if (!CanRepairAt(order.Target.Actor) || !ShouldRepair())
 				return;
 
-			self.CancelActivity();
+			if (!order.Queued)
+				self.CancelActivity();
+
 			self.QueueActivity(movement.MoveWithinRange(order.Target, info.CloseEnough));
 			self.QueueActivity(new Repair(self, order.Target.Actor, info.CloseEnough));