diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
index c008d76c..06c0d725 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
@@ -55,7 +55,7 @@ public class TablistManager extends BasicListener {
     public TablistManager() {
         VelocityCore.schedule(this::updateTablist).repeat(1, TimeUnit.SECONDS).schedule();
         synchronized (tablists) {
-            VelocityCore.getProxy().getAllPlayers().forEach(player -> tablists.put(player, new Tablist(player)));
+            VelocityCore.getProxy().getAllPlayers().forEach(player -> tablists.computeIfAbsent(player, Tablist::new).onServerSwitch());
         }
     }