diff --git a/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java b/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java
index 027e0dce..76bac2b3 100644
--- a/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java
+++ b/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java
@@ -51,19 +51,12 @@ public void onPlayerJoin(PostLoginEvent e) {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerDisconnect(PlayerDisconnectEvent e) {
         try {
             TabView tabView = btlp.getTabViewManager().onPlayerDisconnect(e.getPlayer());
             btlp.getListener().onTabViewRemoved(tabView);
             btlp.getBungeePlayerProvider().onPlayerDisconnected(e.getPlayer());
-
-            // hack to revert changes from https://github.com/SpigotMC/BungeeCord/commit/830f18a35725f637d623594eaaad50b566376e59
-            Server server = e.getPlayer().getServer();
-            if (server != null) {
-                server.disconnect("Quitting");
-            }
-            ((UserConnection) e.getPlayer()).setServer(null);
         } catch (Throwable th) {
             BungeeTabListPlus.getInstance().reportError(th);
         }