diff --git a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
index 5f264ac..1399e6c 100644
--- a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
+++ b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java
@@ -73,6 +73,10 @@ public class SocketClientMessageListener implements KraSocketClientEventInterfac
             ServiceTask serviceTask = CloudNetDriver.getInstance().getServiceTaskProvider()
                 .getServiceTask("Lobby");
 
+            if (!playersAutoRestartServerSystem.containsKey("lobby")) {
+              playersAutoRestartServerSystem.put("lobby", null);
+            }
+
             if (serviceTask != null) {
               ServiceInfoSnapshot serviceInfoSnapshot = ServiceConfiguration.builder(serviceTask)
                   .build().createNewService();
@@ -110,7 +114,8 @@ public class SocketClientMessageListener implements KraSocketClientEventInterfac
       case 59739: { // send players back to server - auto restart system
         String serverName = kraProtocolMessage.getArgs().toLowerCase();
 
-        if (serverName.startsWith("lobby")) { // close old lobbies
+        if (serverName.startsWith("lobby") && playersAutoRestartServerSystem.containsKey(
+            "lobby")) { // close old lobbies
           Collection<ServiceInfoSnapshot> serviceInfoSnapshots = CloudNetDriver.getInstance()
               .getCloudServiceProvider()
               .getCloudServices("Lobby");