diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index fd386a9e..d69a1e81 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -69,15 +69,11 @@ public class TablistManager extends BasicListener {
         }
     }
 
-    private void calculateSize(){
+    private void calculateSize() {
         size = -1;
-        for(Map.Entry<String, List<ProxiedPlayer>> server : playerMap.entrySet())
-            size += 2 + server.getValue().size();
-
-        size = (size+19)/20;
-
-        if(size > 5)
-            size = 5;
+        size += playerMap.size() * 2 + ProxyServer.getInstance().getPlayers().size();
+        size = (size + 19) / 20;
+        if(size > 5) size = 5;
     }
 
     private synchronized void updateCustomTablist(){
@@ -224,8 +220,6 @@ public class TablistManager extends BasicListener {
                     i = update(currentServer, players, i);
                 }
 
-                // Shrink Down
-                setSize(Math.min((i + 19) / 20, 4), 20);
                 finish(i);
             }catch(IndexOutOfBoundsException | NullPointerException e){
                 //Ignore IndexOutOfBoundsException