diff --git a/src/haproxy.c b/src/haproxy.c
index 74fb70e..617a08d 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -142,6 +142,7 @@
 unsigned long all_proc_mask = 1; /* mask of all processes */
 
 volatile unsigned long sleeping_thread_mask = 0; /* Threads that are about to sleep in poll() */
+volatile unsigned long stopping_thread_mask = 0; /* Threads acknowledged stopping */
 
 /* global options */
 struct global global = {
@@ -2633,8 +2634,12 @@
 		/* Check if we can expire some tasks */
 		next = wake_expired_tasks();
 
+		if (stopping && tasks_run_queue == 0)
+			_HA_ATOMIC_OR(&stopping_thread_mask, tid_bit);
+
 		/* stop when there's nothing left to do */
-		if ((jobs - unstoppable_jobs) == 0)
+		if ((jobs - unstoppable_jobs) == 0 && tasks_run_queue == 0 &&
+		    (stopping_thread_mask & all_threads_mask) == all_threads_mask)
 			break;
 
 		/* also stop  if we failed to cleanly stop all tasks */