diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
index 315717a6..1d8a0738 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
@@ -142,8 +142,10 @@ public class Tablist extends ChannelInboundHandlerAdapter {
     }
 
     public void onServerPostSwitch() {
-        if(player.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_20)) {
-            current.clear();
+        if(player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20)) {
+            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 29cebb38..c008d76c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
@@ -65,7 +65,7 @@ public class TablistManager extends BasicListener {
             tablists.computeIfAbsent(event.getPlayer(), Tablist::new).onServerSwitch();
         }
 
-        if(event.getPlayer().getProtocolVersion().noGreaterThan(ProtocolVersion.MINECRAFT_1_20))
+        if(event.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20))
             Tablist.sendPacket(event.getPlayer(), Tablist.createTeamPacket);
     }