diff --git a/dev/caddy.sh b/dev/caddy.sh
index 7274bd376d2..d12aad19f79 100755
--- a/dev/caddy.sh
+++ b/dev/caddy.sh
@@ -29,4 +29,6 @@ chmod +x "${target}"
 
 popd >/dev/null
 
-exec "${target}" "$@"
+trap '${target} stop' EXIT SIGINT
+eval "${target} start"
+"${target}" "$@"