diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts
index 492cddf..3da84f6 100644
--- a/apps/server/src/index.ts
+++ b/apps/server/src/index.ts
@@ -2,7 +2,7 @@ import { env } from "@haushaltsApp/env/server";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
-import { websocket } from "./ws/bun-ws";
+import { websocket } from "hono/bun";
 import { registerRoutes } from "./routes";
 
 const app = new Hono();
@@ -20,13 +20,7 @@ app.use(
 
 registerRoutes(app);
 
-if (typeof Bun !== "undefined" && !process.env.BUN_TEST) {
-  Bun.serve({
-    port: Number(process.env.PORT ?? 3000),
-    hostname: "0.0.0.0",
-    fetch: app.fetch,
-    websocket,
-  });
-}
-
-export default app;
+export default {
+  fetch: app.fetch,
+  websocket,
+};
diff --git a/apps/server/src/routes/shopping.routes.ts b/apps/server/src/routes/shopping.routes.ts
index 37b3afe..4656ced 100644
--- a/apps/server/src/routes/shopping.routes.ts
+++ b/apps/server/src/routes/shopping.routes.ts
@@ -7,7 +7,7 @@ import { addShoppingItemSchema } from "@haushaltsApp/shared/schemas/shopping.sch
 import { authMiddleware, requireAuth, type AuthVariables } from "../middleware/auth.middleware";
 import { tenantMiddleware, requireHousehold, type TenantVariables } from "../middleware/tenant.middleware";
 import { broadcast, createShoppingWsHandler } from "../ws/shopping-ws";
-import { upgradeWebSocket } from "../ws/bun-ws";
+import { upgradeWebSocket } from "hono/bun";
 import {
   getShoppingItems,
   addShoppingItem,
diff --git a/apps/server/src/ws/bun-ws.ts b/apps/server/src/ws/bun-ws.ts
deleted file mode 100644
index dc8dde5..0000000
--- a/apps/server/src/ws/bun-ws.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { upgradeWebSocket, websocket } from "hono/bun";
diff --git a/apps/server/src/ws/shopping-ws.ts b/apps/server/src/ws/shopping-ws.ts
index de68d85..49b4033 100644
--- a/apps/server/src/ws/shopping-ws.ts
+++ b/apps/server/src/ws/shopping-ws.ts
@@ -9,7 +9,7 @@ import {
   uncheckShoppingItem,
   deleteShoppingItem,
 } from "../services/shopping.service";
-export { upgradeWebSocket } from "./bun-ws";
+export { upgradeWebSocket } from "hono/bun";
 
 type WsData = { householdId: string; userId: string };