diff --git a/develop/dev.env b/develop/dev.env
index 5d8fa53890..477e226d36 100644
--- a/develop/dev.env
+++ b/develop/dev.env
@@ -4,7 +4,7 @@ CONTACTS_HOST=contacts
 DOCSTORE_HOST=docstore
 DOCUMENT_UPDATER_HOST=document-updater
 FILESTORE_HOST=filestore
-GRACEFUL_SHUTDOWN_DELAY=0
+GRACEFUL_SHUTDOWN_DELAY_SECONDS=0
 HISTORY_V1_HOST=history-v1
 LISTEN_ADDRESS=0.0.0.0
 MONGO_HOST=mongo
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index 8bd88e8e79..5ee72d0f47 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -550,10 +550,8 @@ module.exports = {
   behindProxy: false,
 
   // Delay before closing the http server upon receiving a SIGTERM process signal.
-  gracefulShutdownDelayInMs: parseInt(
-    process.env.GRACEFUL_SHUTDOWN_DELAY || 30 * seconds,
-    10
-  ),
+  gracefulShutdownDelayInMs:
+    parseInt(process.env.GRACEFUL_SHUTDOWN_DELAY_SECONDS ?? '5', 10) * seconds,
 
   // Expose the hostname in the `X-Served-By` response header
   exposeHostname: process.env.EXPOSE_HOSTNAME === 'true',