diff --git a/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js b/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js
index 63401dd1fd..cac2a5beeb 100644
--- a/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js
+++ b/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js
@@ -117,7 +117,7 @@ class GameSettingsController
 		}
 
 		for (const handler of this.settingsLoadedHandlers)
-			handler();
+			handler(isSavedGame);
 
 		this.updateLayout();
 		this.setNetworkInitAttributes();
diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
index e2a4a2d8b4..3139fc045c 100644
--- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
+++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
@@ -13,9 +13,9 @@ GameSettingControls.MapSelection = class MapSelection extends GameSettingControl
 		};
 	}
 
-	onSettingsLoaded()
+	onSettingsLoaded(isSavedGame)
 	{
-		if (this.gameSettingsController.guiData.lockSettings?.map)
+		if (this.gameSettingsController.guiData.lockSettings?.map || isSavedGame)
 		{
 			if (!g_GameSettings.map)
 			{