diff --git a/src/de/steamwar/bungeecore/arenasystem/Arena.java b/src/de/steamwar/bungeecore/arenasystem/Arena.java
index eddf6ef..c2599df 100644
--- a/src/de/steamwar/bungeecore/arenasystem/Arena.java
+++ b/src/de/steamwar/bungeecore/arenasystem/Arena.java
@@ -79,12 +79,12 @@ public class Arena implements Runnable{
     }
 
     void stop(){
+        ProxyServer.getInstance().getServers().remove(serverName);
         if(p != null && p.isAlive()){
             for(ProxiedPlayer player : server.getPlayers()){
                 player.connect(ProxyServer.getInstance().getServerInfo(BungeeCore.LobbyServer));
             }
             writer.println("stop");
-            ProxyServer.getInstance().getServers().remove(serverName);
             ProxyServer.getInstance().getScheduler().runAsync(BungeeCore.instance, ()->{
                 try {
                     p.waitFor();
diff --git a/src/de/steamwar/bungeecore/bausystem/BauServer.java b/src/de/steamwar/bungeecore/bausystem/BauServer.java
index bac05fe..eb960bb 100644
--- a/src/de/steamwar/bungeecore/bausystem/BauServer.java
+++ b/src/de/steamwar/bungeecore/bausystem/BauServer.java
@@ -57,13 +57,13 @@ public class BauServer implements Runnable{
     }
 
     public void stop(){
+        ProxyServer.getInstance().getServers().remove(name);
         if(p != null && p.isAlive()) {
             for (ProxiedPlayer player : server.getPlayers()) {
                 player.connect(ProxyServer.getInstance().getServerInfo(BungeeCore.LobbyServer));
             }
             stopped = true;
             writer.println("stop");
-            ProxyServer.getInstance().getServers().remove(name);
             ProxyServer.getInstance().getScheduler().runAsync(BungeeCore.instance, ()->{
                 try {
                     p.waitFor();