diff --git a/bench/config/templates/supervisor.conf b/bench/config/templates/supervisor.conf
index de5f0298c..c6a0fb0d7 100644
--- a/bench/config/templates/supervisor.conf
+++ b/bench/config/templates/supervisor.conf
@@ -2,13 +2,15 @@
 ; priority=1 --> Lower priorities indicate programs that start first and shut down last
 ; killasgroup=true --> send kill signal to child processes too
 
+; graceful timeout should always be lower than stopwaitsecs to avoid orphan gunicorn workers.
 [program:{{ bench_name }}-frappe-web]
-command={{ bench_dir }}/env/bin/gunicorn -b 127.0.0.1:{{ webserver_port }} -w {{ gunicorn_workers }} --max-requests {{ gunicorn_max_requests }} --max-requests-jitter {{ gunicorn_max_requests_jitter }} -t {{ http_timeout }} frappe.app:application --preload
+command={{ bench_dir }}/env/bin/gunicorn -b 127.0.0.1:{{ webserver_port }} -w {{ gunicorn_workers }} --max-requests {{ gunicorn_max_requests }} --max-requests-jitter {{ gunicorn_max_requests_jitter }} -t {{ http_timeout }} --graceful-timeout 30 frappe.app:application --preload
 priority=4
 autostart=true
 autorestart=true
 stdout_logfile={{ bench_dir }}/logs/web.log
 stderr_logfile={{ bench_dir }}/logs/web.error.log
+stopwaitsecs=40
 user={{ user }}
 directory={{ sites_dir }}