diff --git a/src/de/steamwar/bungeecore/commands/BauCommand.java b/src/de/steamwar/bungeecore/commands/BauCommand.java
index c090a5b..8d63132 100644
--- a/src/de/steamwar/bungeecore/commands/BauCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BauCommand.java
@@ -221,8 +221,7 @@ public class BauCommand {
         ProxiedPlayer z = ProxyServer.getInstance().getPlayer(SteamwarUser.get(target.getMemberID()).getUuid());
         if(z != null){
             Message.send("BAU_DELMEMBER_DELETED_TARGET", z, p.getName());
-            Collection<Subserver> servers = Subserver.getAllServers(z);
-            if (!servers.isEmpty() && servers.stream().filter(server -> server.getType() == Servertype.BAUSERVER).anyMatch(server -> ((Bauserver) server).getOwner().equals(p.getUniqueId()))) {
+            if (Subserver.getServerList().stream().filter(server -> server.onServer(p) && server.getType() == Servertype.BAUSERVER).anyMatch(server -> ((Bauserver) server).getOwner().equals(p.getUniqueId()))) {
                 z.connect(ProxyServer.getInstance().getServerInfo(BungeeCore.LOBBY_SERVER));
             }
         }