diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index d15c0cdbf6..066b5277a0 100644
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -217,6 +217,9 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
+				if (this.Destroyed)
+					return;
+
 				var oldOwner = Owner;
 
 				// momentarily remove from world so the ownership queries don't get confused