diff --git a/OpenRA.Mods.RA/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs
index 0911e818cf..5a9987cbd1 100644
--- a/OpenRA.Mods.RA/Activities/Repair.cs
+++ b/OpenRA.Mods.RA/Activities/Repair.cs
@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA.Activities
 		public override Activity Tick(Actor self)
 		{
 			if (IsCanceled) return NextActivity;
-			if (host != null && !host.IsInWorld) return NextActivity;
+			if (host == null || !host.IsInWorld) return NextActivity;
 
 			health = self.TraitOrDefault<Health>();
 			if (health == null) return NextActivity;