diff --git a/src/main/java/org/geysermc/connect/extension/PacketHandler.java b/src/main/java/org/geysermc/connect/extension/PacketHandler.java
index 8af94c5..93892ed 100644
--- a/src/main/java/org/geysermc/connect/extension/PacketHandler.java
+++ b/src/main/java/org/geysermc/connect/extension/PacketHandler.java
@@ -63,8 +63,10 @@ public class PacketHandler extends UpstreamPacketHandler {
 
     @Override
     public void onDisconnect(String reason) {
-        geyserConnect.logger().info(Utils.displayName(session) + " has disconnected (" + reason + ")");
-        ServerManager.unloadServers(session);
+        if (session.getAuthData() != null) {
+            geyserConnect.logger().info(Utils.displayName(session) + " has disconnected (" + reason + ")");
+            ServerManager.unloadServers(session);
+        }
     }
 
     @Override
diff --git a/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java b/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java
index 39113ec..f264aec 100644
--- a/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java
+++ b/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java
@@ -95,7 +95,6 @@ public class UIHandler {
                 .label(message)
                 .resultHandler((customForm, customFormResponseFormResponseResult) -> {
                     sendMainMenu();
-//                    this.sendToServer(new Server("test.geysermc.org", 25565));
                 })
                 .build());
         } else {