diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index 066b5277a0..d0fb5e7981 100644
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -204,9 +204,12 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (Destroyed) return;
+				if (Destroyed)
+					return;
+
+				if (IsInWorld)
+					World.Remove(this);
 
-				World.Remove(this);
 				World.traitDict.RemoveActor(this);
 				Destroyed = true;
 			});