diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index e8f363267d..36f1f15e90 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -72,6 +72,12 @@ namespace OpenRA.Editor
 			// load the map
 			var map = new Map(new Folder(mapname));
 
+			// upgrade maps that have no player definitions. editor doesnt care,
+			// but this breaks the game pretty badly.
+			if (map.Players.Count == 0)
+				map.Players.Add("Neutral", new PlayerReference("Neutral",
+						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+
 			PrepareMapResources(manifest, map);
 
 			dirty = false;