diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
index 2c380a90..f15bc79c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
@@ -142,8 +142,14 @@ public class Tablist extends ChannelInboundHandlerAdapter {
     }
 
     public void onServerPostSwitch() {
-        if(player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20))
+        if(player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20)) {
+            if(player.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_20)) {
+                sendTabPacket(current, null);
+                current.clear();
+            }
+
             sendPacket(player, createTeamPacket);
+        }
     }
 
     private void injection() {