diff --git a/src/McpServer/autopilot-monitor-mcp/src/index.ts b/src/McpServer/autopilot-monitor-mcp/src/index.ts
index a91d2ea6..04419d72 100644
--- a/src/McpServer/autopilot-monitor-mcp/src/index.ts
+++ b/src/McpServer/autopilot-monitor-mcp/src/index.ts
@@ -102,11 +102,14 @@ app.all('/mcp', async (req, res) => {
   const server = createMcpServer();
   await server.connect(transport);
 
+  await transport.handleRequest(req, res, req.body);
+
+  // Register AFTER handleRequest — the session ID is only assigned during
+  // initialize processing inside handleRequest, not before.
   if (transport.sessionId) {
     transports.set(transport.sessionId, transport);
+    console.error(`[mcp] Session ${transport.sessionId} registered`);
   }
-
-  await transport.handleRequest(req, res, req.body);
 });
 
 app.listen(PORT, '0.0.0.0', () => {