diff --git a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
index 7f870c5529..56f88ab0d7 100644
--- a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
@@ -146,8 +146,10 @@ class MapOptionsTable(val newGameScreen: NewGameScreen): Table() {
         mapFileSelectBox.items = mapFiles
         val selectedItem = mapFiles.firstOrNull { it.fileHandle.name()==mapParameters.name }
         if (selectedItem != null) mapFileSelectBox.selected = selectedItem
-        else mapFileSelectBox.selected = mapFiles.first()
-        newGameScreen.gameSetupInfo.mapFile = mapFileSelectBox.selected.fileHandle
+        else if (!mapFiles.isEmpty) {
+            mapFileSelectBox.selected = mapFiles.first()
+            newGameScreen.gameSetupInfo.mapFile = mapFileSelectBox.selected.fileHandle
+        }
 
         mapFileSelectBox.onChange {
             val mapFile =  mapFileSelectBox.selected.fileHandle