diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index db024c987..e17c4589c 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -310,6 +310,10 @@ void ApiListener::Start(bool runtimeCreated)
 	m_ApiPackageIntegrityTimer->Start();
 
 	OnMasterChanged(true);
+
+	if (GetMaxAnonymousClients() < 0) {
+		SetMaxAnonymousClients(ConfigType::GetObjectsByType<Endpoint>().size() * 2u, true);
+	}
 }
 
 void ApiListener::RenewOwnCert()