diff --git a/src/de/steamwar/bungeecore/tablist/TablistServer.java b/src/de/steamwar/bungeecore/tablist/TablistServer.java
index 6c67d56..5480940 100644
--- a/src/de/steamwar/bungeecore/tablist/TablistServer.java
+++ b/src/de/steamwar/bungeecore/tablist/TablistServer.java
@@ -90,6 +90,7 @@ public class TablistServer implements TablistPart {
 
     public static Stream<Item> teamify(List<Item> players, ProxiedPlayer player) {
         int team = SteamwarUser.get(player.getUniqueId()).getTeam();
+        if (team == 0) return players.stream();
         return players.stream().map(item -> {
             ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
             if (p == null) return item;