diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts
index eaedd64..c0f8a4c 100644
--- a/apps/server/src/index.ts
+++ b/apps/server/src/index.ts
@@ -2,8 +2,8 @@ import { env } from "@haushaltsApp/env/server";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
+import { injectWebSocket } from "./ws/bun-ws";
 import { registerRoutes } from "./routes";
-import { injectWebSocket } from "./ws/shopping-ws";
 
 const app = new Hono();
 
diff --git a/apps/server/src/routes/shopping.routes.ts b/apps/server/src/routes/shopping.routes.ts
index 10f4d02..37b3afe 100644
--- a/apps/server/src/routes/shopping.routes.ts
+++ b/apps/server/src/routes/shopping.routes.ts
@@ -6,7 +6,8 @@ import type { ShoppingServerEvent } from "@haushaltsApp/shared/schemas/shopping.
 import { addShoppingItemSchema } from "@haushaltsApp/shared/schemas/shopping.schema";
 import { authMiddleware, requireAuth, type AuthVariables } from "../middleware/auth.middleware";
 import { tenantMiddleware, requireHousehold, type TenantVariables } from "../middleware/tenant.middleware";
-import { broadcast, upgradeWebSocket, createShoppingWsHandler } from "../ws/shopping-ws";
+import { broadcast, createShoppingWsHandler } from "../ws/shopping-ws";
+import { upgradeWebSocket } from "../ws/bun-ws";
 import {
   getShoppingItems,
   addShoppingItem,
diff --git a/apps/server/src/ws/bun-ws.ts b/apps/server/src/ws/bun-ws.ts
new file mode 100644
index 0000000..de92cac
--- /dev/null
+++ b/apps/server/src/ws/bun-ws.ts
@@ -0,0 +1,3 @@
+import { createBunWebSocket } from "hono/bun";
+
+export const { upgradeWebSocket, injectWebSocket } = createBunWebSocket();
diff --git a/apps/server/src/ws/shopping-ws.ts b/apps/server/src/ws/shopping-ws.ts
index 1a2fd5d..de68d85 100644
--- a/apps/server/src/ws/shopping-ws.ts
+++ b/apps/server/src/ws/shopping-ws.ts
@@ -1,6 +1,5 @@
 import { db, eq, and, isNotNull } from "@haushaltsApp/db";
 import { shoppingItems } from "@haushaltsApp/db/schema";
-import { createBunWebSocket } from "hono/bun";
 import type { WSContext } from "hono/ws";
 import type { ShoppingServerEvent, ShoppingClientCommand } from "@haushaltsApp/shared/schemas/shopping.schema";
 import {
@@ -10,11 +9,10 @@ import {
   uncheckShoppingItem,
   deleteShoppingItem,
 } from "../services/shopping.service";
+export { upgradeWebSocket } from "./bun-ws";
 
 type WsData = { householdId: string; userId: string };
 
-export const { upgradeWebSocket, injectWebSocket } = createBunWebSocket<WsData>();
-
 // ── Room Management ────────────────────────────────────────────────────────────
 
 const rooms = new Map<string, Set<WSContext<WsData>>>();