diff --git a/src/haproxy.c b/src/haproxy.c
index 759612dfd..c7905a52e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1417,7 +1417,7 @@ static int compute_ideal_maxconn()
 	int ssl_sides = !!global.ssl_used_frontend + !!global.ssl_used_backend;
 	int engine_fds = global.ssl_used_async_engines * ssl_sides;
 	int pipes = compute_ideal_maxpipes();
-	int remain = rlim_fd_cur_at_boot;
+	int remain = MAX(rlim_fd_cur_at_boot, rlim_fd_max_at_boot);
 	int maxconn;
 
 	/* we have to take into account these elements :