diff --git a/OpenRA.Mods.RA/Activities/RepairBuilding.cs b/OpenRA.Mods.RA/Activities/RepairBuilding.cs
index 2810bc9db2..8ee7370a03 100644
--- a/OpenRA.Mods.RA/Activities/RepairBuilding.cs
+++ b/OpenRA.Mods.RA/Activities/RepairBuilding.cs
@@ -22,7 +22,10 @@ namespace OpenRA.Mods.RA.Activities
 
 		public IActivity Tick(Actor self)
 		{
-			if (!target.IsValid) return NextActivity;
+			if (!target.IsValid) return NextActivity;
+			if ((target.Actor.Location - self.Location).Length > 1)
+				return NextActivity;
+
 			var health = target.Actor.Trait<Health>();
 			if (health.DamageState == DamageState.Undamaged)
 				return NextActivity;