diff --git a/src/de/steamwar/bungeecore/tablist/Tablist.java b/src/de/steamwar/bungeecore/tablist/Tablist.java
index d6f94db..9c0440e 100644
--- a/src/de/steamwar/bungeecore/tablist/Tablist.java
+++ b/src/de/steamwar/bungeecore/tablist/Tablist.java
@@ -261,13 +261,16 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                     return;
                 }
 
+                boolean playerNotOnTeamserver = !Storage.teamServers.containsValue(player.getServer().getInfo());
                 for(PlayerListItemUpdate.Action action : actions) {
                     switch (action) {
                         case ADD_PLAYER:
                             for (PlayerListItem.Item item : list.getItems()) {
                                 item.setPing(1);
-                                item.setDisplayName(new TextComponent());
-                                item.setListed(false);
+                                if (playerNotOnTeamserver) {
+                                    item.setDisplayName(new TextComponent());
+                                    item.setListed(false);
+                                }
                                 item.setPublicKey(null);
                                 if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
                                     item.setGamemode(1);