diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
index 85256c4cb0..f73f3d3610 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
@@ -153,7 +153,10 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 		
 		void StartSkirmishGame()
 		{
-			var map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Key;
+			var maps = Game.modData.AvailableMaps;
+			string map = maps.ContainsKey(Game.Settings.Server.Map) ? Game.Settings.Server.Map : 
+				maps.FirstOrDefault(m => m.Value.Selectable).Key;
+
 			var port = Game.CreateLocalServer(map);
 			CncConnectingLogic.Connect(IPAddress.Loopback.ToString(),
 			                           port,