diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java
index 077cd71f1a..b9f14a19ac 100644
--- a/core/src/io/anuke/mindustry/maps/Maps.java
+++ b/core/src/io/anuke/mindustry/maps/Maps.java
@@ -457,7 +457,7 @@ public class Maps{
             return maps.find(m -> m != prev || maps.size == 1);
         }),
         custom(prev -> {
-            Array<Map> maps = Array.withArrays(Vars.maps.customMaps());
+            Array<Map> maps = Array.withArrays(Vars.maps.customMaps().isEmpty() ? Vars.maps.defaultMaps() : Vars.maps.customMaps());
             maps.shuffle();
             return maps.find(m -> m != prev || maps.size == 1);
         }),
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 570d3a8414..acbe681ad9 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -60,7 +60,7 @@ public class ServerControl implements ApplicationListener{
             "shufflemode", "normal",
             "bans", "",
             "admins", "",
-            "shufflemode", "all",
+            "shufflemode", "custom",
             "crashreport", false,
             "port", port,
             "logging", true,