Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
@@ -33,7 +33,6 @@
 		{
 			g_GameSettings.map.watch(() => this.render(), ["map"]);
 			g_GameSettings.map.watch(() => this.updateMapList(), ["type"]);
-
 			this.gameSettingsController.guiData.mapFilter.watch(() => this.updateMapList(), ["filter"]);
 
 			this.updateMapList();
@@ -77,12 +76,15 @@
 			return;
 
 		{
-			let values =
+			const values =
 				this.mapFilters.getFilteredMaps(
 					g_GameSettings.map.type,
 					this.gameSettingsController.guiData.mapFilter.filter,
 					false);
 
+			if (!values.length)
+				return;
+
 			values.sort(sortNameIgnoreCase);
 
 			if (g_GameSettings.map.type == "random")