diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index 48d9adbb..f2a76d5f 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -50,7 +50,7 @@ public class TablistManager extends BasicListener {
     @EventHandler
     public synchronized void onJoin(PostLoginEvent e){
         BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
-            if (BungeeCord.getInstance().getPlayer(e.getPlayer().getUniqueId()) != null) {
+            if (e.getPlayer().isConnected()) {
                 tablists.put(e.getPlayer(), new Tablist(e.getPlayer()));
             }
         }, 1, TimeUnit.SECONDS);