diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
index fb93a27d..5ed177b0 100644
--- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
+++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
@@ -49,6 +49,7 @@ import java.net.InetSocketAddress;
 import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -141,6 +142,41 @@ public class GeyserConnector {
         bootstrap.getGeyserLogger().info("Shutting down Geyser.");
         shuttingDown = true;
 
+        if (players.size() >= 1) {
+            bootstrap.getGeyserLogger().info("Kicking " + players.size() + " players");
+
+            for (GeyserSession playerSession : players.values()) {
+                playerSession.disconnect("Geyser Proxy shutting down.");
+            }
+
+            CompletableFuture<Void> future = CompletableFuture.runAsync(new Runnable() {
+                @Override
+                public void run() {
+                    // Simulate a long-running Job
+                    try {
+                        while (true) {
+                            bootstrap.getGeyserLogger().info("Current entries: " + players.size());
+                            if (players.size() == 0) {
+                                return;
+                            }
+
+                            TimeUnit.MILLISECONDS.sleep(100);
+                        }
+                    } catch (InterruptedException e) {
+                        throw new IllegalStateException(e);
+                    }
+                }
+            });
+
+            // Block and wait for the future to complete
+            try {
+                future.get();
+                bootstrap.getGeyserLogger().info("Kicked all players");
+            } catch (Exception e) {
+                // Quietly fail
+            }
+        }
+
         generalThreadPool.shutdown();
         bedrockServer.close();
         players.clear();
@@ -148,6 +184,8 @@ public class GeyserConnector {
         authType = null;
         commandMap.getCommands().clear();
         commandMap = null;
+
+        bootstrap.getGeyserLogger().info("Geyser shutdown successfully.");
     }
 
     public void addPlayer(GeyserSession player) {
diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
index 4694d0fd..2222cdef 100644
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
@@ -48,6 +48,11 @@ public class StopCommand extends GeyserCommand {
         if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
             return;
         }
+
         connector.shutdown();
+
+        if (connector.getPlatformType() == PlatformType.STANDALONE) {
+            System.exit(0);
+        }
     }
 }