diff --git a/src/de/steamwar/bungeecore/tablist/TablistBuild.java b/src/de/steamwar/bungeecore/tablist/TablistBuild.java
index 58e7ff44..db469f21 100644
--- a/src/de/steamwar/bungeecore/tablist/TablistBuild.java
+++ b/src/de/steamwar/bungeecore/tablist/TablistBuild.java
@@ -70,7 +70,7 @@ public class TablistBuild implements TablistPart {
                     .map(item -> {
                         ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
                         if (p == null) return item;
-                        if (SteamwarUser.get(p).getTeam() != team) return item;
+                        if (SteamwarUser.get(p.getUniqueId()).getTeam() != team) return item;
                         return new Item(p, true);
                     }).forEach(((server == info) ? direct : tablist)::add);
         }
diff --git a/src/de/steamwar/bungeecore/tablist/TablistServer.java b/src/de/steamwar/bungeecore/tablist/TablistServer.java
index 3e47f261..59a56f2a 100644
--- a/src/de/steamwar/bungeecore/tablist/TablistServer.java
+++ b/src/de/steamwar/bungeecore/tablist/TablistServer.java
@@ -79,7 +79,7 @@ public class TablistServer implements TablistPart {
         players.stream().map(item -> {
             ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
             if (p == null) return item;
-            if (SteamwarUser.get(p).getTeam() != team) return item;
+            if (SteamwarUser.get(p.getUniqueId()).getTeam() != team) return item;
             return new Item(p, true);
         }).forEach(items::add);
     }