diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
index f8dc1783..92484166 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
@@ -139,7 +139,9 @@ public class Tablist extends ChannelInboundHandlerAdapter {
         synchronized (directTabItems) {
             directTabItems.clear();
         }
+    }
 
+    public void onServerPostSwitch() {
         if(player.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_20)) {
             current.clear();
             sendPacket(player, createTeamPacket);
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
index 2b8b47bd..6429fded 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.tablist;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
+import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.event.player.ServerPostConnectEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
@@ -67,12 +68,19 @@ public class TablistManager extends BasicListener {
     }
 
     @Subscribe
-    public void onServerConnection(ServerPostConnectEvent event) {
+    public void onServerConnection(ServerConnectedEvent event) {
         synchronized (tablists) {
             tablists.get(event.getPlayer()).onServerSwitch();
         }
     }
 
+    @Subscribe
+    public void onServerPostConnection(ServerPostConnectEvent event) {
+        synchronized (tablists) {
+            tablists.get(event.getPlayer()).onServerPostSwitch();
+        }
+    }
+
     @Subscribe
     public void onLeave(DisconnectEvent event) {
         synchronized (tablists) {