diff --git a/src/de/steamwar/bungeecore/Subserver.java b/src/de/steamwar/bungeecore/Subserver.java
index 79270c1..797de0c 100644
--- a/src/de/steamwar/bungeecore/Subserver.java
+++ b/src/de/steamwar/bungeecore/Subserver.java
@@ -151,7 +151,9 @@ public class Subserver implements Runnable {
             fatalError();
             Thread.currentThread().interrupt();
         } finally {
-            serverList.remove(this);
+            synchronized (serverList){
+                serverList.remove(this);
+            }
             ProxyServer.getInstance().getServers().remove(serverName);
             shutdownCallback.run();
         }