diff --git a/OpenRA.Mods.RA/Effects/RepairIndicator.cs b/OpenRA.Mods.RA/Effects/RepairIndicator.cs
index 4869724582..d5eb66ba8d 100755
--- a/OpenRA.Mods.RA/Effects/RepairIndicator.cs
+++ b/OpenRA.Mods.RA/Effects/RepairIndicator.cs
@@ -35,8 +35,9 @@ namespace OpenRA.Mods.RA.Effects
 
 		public IEnumerable<Renderable> Render()
 		{
-			yield return new Renderable(anim.Image, 
-				a.CenterLocation - .5f * anim.Image.size, "chrome", (int)a.CenterLocation.Y);
+			if (a.IsInWorld)
+				yield return new Renderable(anim.Image, 
+					a.CenterLocation - .5f * anim.Image.size, "chrome", (int)a.CenterLocation.Y);
 		}
 	}
 }