diff --git a/src/de/steamwar/bungeecore/tablist/Tablist.java b/src/de/steamwar/bungeecore/tablist/Tablist.java
index e5cf7f32..07cb5b3d 100644
--- a/src/de/steamwar/bungeecore/tablist/Tablist.java
+++ b/src/de/steamwar/bungeecore/tablist/Tablist.java
@@ -95,8 +95,9 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                     update.add(tabItem);
                 }
             }
+            boolean playerOnTeamserver = !Storage.teamServers.containsValue(player.getServer().getInfo());
             for(PlayerListItem.Item item : directTabItems.values()) {
-                if(!nonNPCs.contains(item.getUuid()) && !npcs.contains(item.getUuid()) && !player.getUniqueId().equals(item.getUuid())) {
+                if(!playerOnTeamserver && !nonNPCs.contains(item.getUuid()) && !npcs.contains(item.getUuid()) && !player.getUniqueId().equals(item.getUuid())) {
                     npcs.add(item.getUuid());
                     addNpc.add(item.getUsername());
                 }
@@ -210,10 +211,13 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                         }
                         break;
                     case ADD_PLAYER:
+                        boolean playerOnTeamserver = !Storage.teamServers.containsValue(player.getServer().getInfo());
                         for (PlayerListItem.Item item : list.getItems()) {
                             item.setPing(1);
-                            item.setDisplayName(new TextComponent());
-                            item.setListed(false);
+                            if (playerOnTeamserver) {
+                                item.setDisplayName(new TextComponent());
+                                item.setListed(false);
+                            }
                             item.setPublicKey(null);
                             if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
                                 item.setGamemode(1);