diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index d5da6f23..5daf5831 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -241,7 +241,8 @@ public class TablistManager extends BasicListener {
         }
 
         private Team getTeam(ProxiedPlayer p) {
-            return Team.get(SteamwarUser.get(p).getTeam());
+            Team team = Team.get(SteamwarUser.get(p).getTeam());
+            return team.getTeamId() <= 0 ? null : team;
         }
 
         private String getTablistName(ProxiedPlayer p, boolean sameServer) {