diff --git a/src/de/steamwar/bungeecore/tablist/TablistBuild.java b/src/de/steamwar/bungeecore/tablist/TablistBuild.java
index 15039fe4..4f7f2b64 100644
--- a/src/de/steamwar/bungeecore/tablist/TablistBuild.java
+++ b/src/de/steamwar/bungeecore/tablist/TablistBuild.java
@@ -38,7 +38,7 @@ public class TablistBuild implements TablistPart {
     private final Map<ServerInfo, List<Item>> players = new HashMap<>();
 
     public TablistBuild() {
-        for (ServerInfo server : ProxyServer.getInstance().getServersCopy().values()){
+        for (ServerInfo server : new ArrayList<>(ProxyServer.getInstance().getServers().values())){
             Subserver subserver = Subserver.getSubserver(server);
             if(server.getPlayers().isEmpty() || subserver == null || subserver.getType() != Servertype.BAUSERVER)
                 continue;
diff --git a/src/de/steamwar/bungeecore/tablist/TablistManager.java b/src/de/steamwar/bungeecore/tablist/TablistManager.java
index b6e78754..2a02d553 100644
--- a/src/de/steamwar/bungeecore/tablist/TablistManager.java
+++ b/src/de/steamwar/bungeecore/tablist/TablistManager.java
@@ -87,7 +87,7 @@ public class TablistManager extends BasicListener {
 
     private void updateTablist() {
         List<TablistPart> subservers = new ArrayList<>();
-        for (ServerInfo server : ProxyServer.getInstance().getServersCopy().values()){
+        for (ServerInfo server : new ArrayList<>(ProxyServer.getInstance().getServers().values())){
             if(server.getPlayers().isEmpty())
                 continue;