diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index fc5ce7cf..c1e99d39 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -219,6 +219,7 @@ public class TablistManager extends BasicListener {
                     i = update(currentServer, players, i);
                 }
 
+                setSize(Math.max((i + 19) / 20, 5), 20);
                 finish(i);
             }catch(IndexOutOfBoundsException | NullPointerException e){
                 //Ignore IndexOutOfBoundsException