diff --git a/bun.lock b/bun.lock
index a67efbd..e86a8c9 100644
--- a/bun.lock
+++ b/bun.lock
@@ -17,6 +17,7 @@
         "@vitejs/plugin-react-swc": "^4.2.3",
         "react": "^19.2.4",
         "react-dom": "^19.2.4",
+        "vite-tsconfig-paths": "^6.1.1",
       },
       "devDependencies": {
         "@biomejs/biome": "2.4.5",
@@ -29,7 +30,6 @@
         "husky": "^9.1.7",
         "lint-staged": "^16.3.2",
         "vite": "^7.3.1",
-        "vite-tsconfig-paths": "^6.1.1",
       },
       "peerDependencies": {
         "typescript": "^5.9.3",
diff --git a/server.ts b/server.ts
index 4d84e88..3d7f0d7 100644
--- a/server.ts
+++ b/server.ts
@@ -546,6 +546,16 @@ async function initializeServer() {
     }
   })
 
+  process.on('SIGINT', () => {
+    log.info('Shutting down server...')
+    server.stop()
+  })
+
+  process.on('SIGTERM', () => {
+    log.info('Shutting down server...')
+    server.stop()
+  })
+
   log.success(`Server listening on http://localhost:${String(server.port)}`)
 }