diff --git a/images/chromium-headful/supervisor/services/kernel-images-api.conf b/images/chromium-headful/supervisor/services/kernel-images-api.conf
index b2142e63..e1d84f9f 100644
--- a/images/chromium-headful/supervisor/services/kernel-images-api.conf
+++ b/images/chromium-headful/supervisor/services/kernel-images-api.conf
@@ -4,5 +4,7 @@ command=/bin/bash -lc 'mkdir -p "${KERNEL_IMAGES_API_OUTPUT_DIR:-/recordings}" &
 autostart=false
 autorestart=true
 startsecs=0
+; graceful shutdown + buffer
+stopwaitsecs=25
 stdout_logfile=/var/log/supervisord/kernel-images-api
 redirect_stderr=true
diff --git a/images/chromium-headless/image/supervisor/services/kernel-images-api.conf b/images/chromium-headless/image/supervisor/services/kernel-images-api.conf
index b2142e63..e1d84f9f 100644
--- a/images/chromium-headless/image/supervisor/services/kernel-images-api.conf
+++ b/images/chromium-headless/image/supervisor/services/kernel-images-api.conf
@@ -4,5 +4,7 @@ command=/bin/bash -lc 'mkdir -p "${KERNEL_IMAGES_API_OUTPUT_DIR:-/recordings}" &
 autostart=false
 autorestart=true
 startsecs=0
+; graceful shutdown + buffer
+stopwaitsecs=25
 stdout_logfile=/var/log/supervisord/kernel-images-api
 redirect_stderr=true