diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp
index eb930049..16d99135 100644
--- a/source/src/serverms.cpp
+++ b/source/src/serverms.cpp
@@ -43,6 +43,8 @@ void disconnectmaster()
 ENetSocket connectmaster()
 {
     if(!mastername[0]) return ENET_SOCKET_NULL;
+    extern servercommandline scl;
+    if(scl.maxclients>20) { logline(ACLOG_WARNING, "maxclient exceeded: cannot register"); return ENET_SOCKET_NULL; }
 
     if(masteraddress.host == ENET_HOST_ANY)
     {