diff --git a/server/src/index.ts b/server/src/index.ts
index bec3626..b331914 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -54,6 +54,11 @@ mcp.tool("docs", () => {
   };
 });
 
+await server.register(FastifyMcpServer, {
+  endpoint: "/mcp",
+  server:   mcp.server,
+});
+
 const mcpServer = getMcpDecorator(server);
 
 const sessionManager = mcpServer.getSessionManager();
@@ -73,11 +78,6 @@ sessionManager.on("transportError", (sessionId: string, error: Error) => {
   void logger.error(`Error in session ${sessionId}:`, error);
 });
 
-await server.register(FastifyMcpServer, {
-  endpoint: "/mcp",
-  server:   mcp.server,
-});
-
 server.listen({ port: 20_000 }, (error) => {
   if (error) {
     void logger.error("instantiate server", error);