diff --git a/compose.yml b/compose.yml
index dc43752..0232238 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,7 +1,7 @@
 services:
   hibine:
-    # build: .
-    image: doradea/hibine:latest
+    build: .
+    # image: doradea/hibine:latest
     volumes:
       - ./notes/:/app/data/
     environment:
diff --git a/server/index.ts b/server/index.ts
index 81e0b7f..07e8b99 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -1,7 +1,6 @@
 import express from 'express';
-import { handler } from '../build/handler.js';
-import { initServerWebsocket } from './websocket.ts';
 import { createServer } from 'http';
+import { initServerWebsocket } from './setupSocket.ts';
 
 const app = express();
 const server = createServer(app);
@@ -10,6 +9,7 @@ const server = createServer(app);
 initServerWebsocket(server);
 
 // sveltekit
+const handler = (await import('../build/handler.js')).handler; // dynamic import to avoid loading sveltekit server hooks before websocket server init
 app.use(handler);
 
 // start server
diff --git a/src/socket.server.ts b/src/socket.server.ts
index 514a722..ad7c49d 100644
--- a/src/socket.server.ts
+++ b/src/socket.server.ts
@@ -60,7 +60,7 @@ export function registerSvelteKitWebsocket() {
   const io = globalThis.myServerSocket;
   if (!io) {
     console.error('Websocket server not initialized');
-    return;
+    throw new Error('Websocket server not initialized');
   }
 
   const fileUserMap = new Map<