diff --git a/src/haproxy.c b/src/haproxy.c
index 494160a..f066ec9 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -177,6 +177,7 @@
 int stopping;	/* non zero means stopping in progress */
 int killed;	/* non zero means a hard-stop is triggered */
 int jobs = 0;   /* number of active jobs (conns, listeners, active tasks, ...) */
+int unstoppable_jobs = 0;  /* number of active jobs that can't be stopped during a soft stop */
 int active_peers = 0; /* number of active peers (connection attempts and connected) */
 int connected_peers = 0; /* number of connected peers (verified ones) */
 
@@ -2617,7 +2618,7 @@
 		next = wake_expired_tasks();
 
 		/* stop when there's nothing left to do */
-		if (jobs == 0)
+		if ((jobs - unstoppable_jobs) == 0)
 			break;
 
 		/* expire immediately if events are pending */