diff --git a/server/src/socket.ts b/server/src/socket.ts
index 11c0681..8616c6e 100644
--- a/server/src/socket.ts
+++ b/server/src/socket.ts
@@ -4,6 +4,7 @@ import type { RowDataPacket } from "mysql2";
 import db from "./db.js";
 import { rollDice } from "./dice.js";
 import { verifyToken } from "./auth/jwt.js";
+import { registerInitiativeHandlers } from "./routes/initiative.js";
 
 interface EffectState {
   active: boolean;
@@ -156,6 +157,8 @@ export function setupSocket(io: Server) {
     socket.on("disconnect", () => {
       // Rooms are cleaned up automatically by Socket.IO
     });
+
+    registerInitiativeHandlers(io, socket);
   });
 }