diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index a169328996..7193c3f270 100755
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -194,6 +194,8 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask( w =>
 			{
+				if (Destroyed || !IsInWorld) return;
+
 				World.Remove( this );
 				World.traitDict.RemoveActor( this );
 				Destroyed = true;