diff --git a/src/haproxy.c b/src/haproxy.c
index b484195..4ee443e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2080,6 +2080,10 @@
 			exit(1);
 	}
 
+	/* set the default maxconn in the master, but let it be rewritable with -n */
+	if (global.mode & MODE_MWORKER_WAIT)
+		global.maxconn = DEFAULT_MAXCONN;
+
 	if (cfg_maxconn > 0)
 		global.maxconn = cfg_maxconn;