diff --git a/src/de/steamwar/bungeecore/tablist/Tablist.java b/src/de/steamwar/bungeecore/tablist/Tablist.java
index 9c0440ee..a9a088f3 100644
--- a/src/de/steamwar/bungeecore/tablist/Tablist.java
+++ b/src/de/steamwar/bungeecore/tablist/Tablist.java
@@ -217,6 +217,8 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                             if (playerNotOnTeamserver) {
                                 item.setDisplayName(new TextComponent());
                                 item.setListed(false);
+                            } else if (item.getDisplayName() == null) {
+                                item.setDisplayName(new TextComponent(item.getUsername()));
                             }
                             item.setPublicKey(null);
                             if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
@@ -270,6 +272,8 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                                 if (playerNotOnTeamserver) {
                                     item.setDisplayName(new TextComponent());
                                     item.setListed(false);
+                                } else if (item.getDisplayName() == null) {
+                                    item.setDisplayName(new TextComponent(item.getUsername()));
                                 }
                                 item.setPublicKey(null);
                                 if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)