diff --git a/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs b/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
index d3d63db563..8f717b69a9 100644
--- a/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
+++ b/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
@@ -51,6 +51,9 @@ namespace OpenRA.Mods.Common.Traits
 				return;
 
 			Players = new MapPlayers(w.Map.PlayerDefinitions);
+
+			var worldOwner = Players.Players.Select(kvp => kvp.Value).First(p => !p.Playable && p.OwnsWorld);
+			w.WorldActor.Owner = new Player(w, null, null, worldOwner);
 		}
 
 		public void WorldLoaded(World world, WorldRenderer wr)