diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index 5daf583..fbfb330 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -204,7 +204,7 @@ public class TablistManager extends BasicListener {
                     Team team = getTeam(player);
                     List<ProxiedPlayer> players = playerMap.get(server)
                             .stream()
-                            .filter(p -> p.getServer().getInfo() == currentServer || SteamwarUser.get(p).getUserGroup() != UserGroup.Member || team == getTeam(p))
+                            .filter(p -> p.getServer().getInfo() == currentServer || SteamwarUser.get(p).getUserGroup() != UserGroup.Member || (team != null && team == getTeam(p)))
                             .collect(Collectors.toList());
                     if (server.equals("Bau")) {
                         Subserver subserver = Subserver.getSubserver(player);