diff --git a/OpenRA.Game/Effects/FlashTarget.cs b/OpenRA.Game/Effects/FlashTarget.cs
index d2667feaba..9c43c2bcf6 100755
--- a/OpenRA.Game/Effects/FlashTarget.cs
+++ b/OpenRA.Game/Effects/FlashTarget.cs
@@ -28,7 +28,7 @@ namespace OpenRA.Effects
 
 		public void Tick( World world )
 		{
-			if (--remainingTicks == 0)
+			if (--remainingTicks == 0 || !target.IsInWorld)
 				world.AddFrameEndTask(w => w.Remove(this));
 		}