diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
index 9976103eba..ffdc3c9433 100644
--- a/lib/puma/cluster.rb
+++ b/lib/puma/cluster.rb
@@ -24,7 +24,9 @@ def stop_workers
       @workers.each { |x| x.term }
 
       begin
-        Process.waitall
+        @workers.each do |w|
+          Process.waitpid(w.pid)
+        end
       rescue Interrupt
         log "! Cancelled waiting for workers"
       end