diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index 7fade9cc..fd386a9e 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -199,13 +199,18 @@ public class TablistManager extends BasicListener {
                             .stream()
                             .filter(p -> p.getServer().getInfo() == currentServer || SteamwarUser.get(p).getUserGroup() != UserGroup.Member || (team != null && team == getTeam(p)))
                             .collect(Collectors.toList());
+
+                    Subserver subserver = Subserver.getSubserver(player);
                     if (server.equals("Bau")) {
-                        Subserver subserver = Subserver.getSubserver(player);
                         if (subserver != null && subserver.getType() == Servertype.BAUSERVER) {
                             players = playerMap.get(server);
                         }
                         server = Message.parse("TABLIST_BAU", player);
                     }
+                    if (subserver != null && subserver.getType() == Servertype.ARENA && playerMap.get(server).size() == 1) {
+                        players = playerMap.get(server);
+                    }
+
                     int increment = playerMap.get(server).size() - players.size();
                     if (players.isEmpty()) {
                         server += " §7(" + increment + ")";