diff --git a/package.json b/package.json
index 5f36916f..53d0a6f0 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
 	},
 	"type": "module",
 	"scripts": {
-		"dev": "wrangler dev -c apps/auth/wrangler.jsonc & issuer=$!; trap \"kill $issuer 2>/dev/null\" EXIT; wrangler dev -c apps/api/wrangler.jsonc",
-		"dev:server": "bun run --cwd apps/auth serve & issuer=$!; trap \"kill $issuer 2>/dev/null\" EXIT; bun run --cwd apps/api serve",
+		"dev": "wrangler dev -c apps/auth/wrangler.jsonc & issuer=$!; wrangler dev -c apps/api/wrangler.jsonc & api=$!; trap 'kill $issuer $api 2>/dev/null' EXIT INT TERM; while kill -0 $issuer 2>/dev/null && kill -0 $api 2>/dev/null; do sleep 1; done",
+		"dev:server": "bun run --cwd apps/auth serve & issuer=$!; bun run --cwd apps/api serve & api=$!; trap 'kill $issuer $api 2>/dev/null' EXIT INT TERM; while kill -0 $issuer 2>/dev/null && kill -0 $api 2>/dev/null; do sleep 1; done",
 		"dev:docker": "docker compose up --build",
 		"db:migrate": "bun run --cwd packages/core db:migrate",
 		"db:push": "bun run --cwd packages/core db:push",