diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 4de933c6f5..25f173049c 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -86,11 +86,18 @@ public class ServerControl extends Module {
                     Map map = previous;
                     while (map == previous) map = maps.random();
 
-                    info("Selected next map to be {0}.", map.name);
-                    state.set(State.playing);
+                    if(map != null) {
 
-                    logic.reset();
-                    world.loadMap(map);
+                        info("Selected next map to be {0}.", map.name);
+                        state.set(State.playing);
+
+                        logic.reset();
+                        world.loadMap(map);
+                    }else{
+                        info("Selected a procedural map.");
+                        world.loadProceduralMap();
+                        logic.play();
+                    }
                 }else{
                     info("Selected a procedural map.");
                     world.loadProceduralMap();