diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 974f9e129e..4fedd2c195 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -148,7 +148,7 @@ public class ServerControl implements ApplicationListener{
                     maps.shuffle();
 
                     Map previous = world.getMap();
-                    Map map = maps.find(m -> m != previous);
+                    Map map = maps.find(m -> m != previous || maps.size == 1);
 
                     if(map != null){
 
@@ -161,6 +161,8 @@ public class ServerControl implements ApplicationListener{
                         info("Selected next map to be {0}.", map.name());
 
                         play(true, () -> world.loadMap(map, map.applyRules(lastMode)));
+                    }else{
+                        Log.err("No suitable map found.");
                     }
                 }
             }else{