diff --git a/plugins/civproxy-velocity/src/main/java/net/civmc/civproxy/CivProxyPlugin.java b/plugins/civproxy-velocity/src/main/java/net/civmc/civproxy/CivProxyPlugin.java
index a45480242..cc41cd5d7 100644
--- a/plugins/civproxy-velocity/src/main/java/net/civmc/civproxy/CivProxyPlugin.java
+++ b/plugins/civproxy-velocity/src/main/java/net/civmc/civproxy/CivProxyPlugin.java
@@ -118,8 +118,9 @@ public class CivProxyPlugin {
     @Subscribe
     public void onKick(KickedFromServerEvent event) {
         RegisteredServer server = event.getServer();
-        System.out.println(event.kickedDuringServerConnect());
-        if (!server.getServerInfo().getName().equals("main") || event.kickedDuringServerConnect()) {
+        if (!server.getServerInfo().getName().equals("main")
+            || event.kickedDuringServerConnect()
+            || !event.getPlayer().getCurrentServer().map(c -> c.getServerInfo().getName().equals("main")).orElse(false)) {
             return;
         }