diff --git a/packages/api/src/mcp/MCPConnectionFactory.ts b/packages/api/src/mcp/MCPConnectionFactory.ts
index 8b8fa17503..3481613632 100644
--- a/packages/api/src/mcp/MCPConnectionFactory.ts
+++ b/packages/api/src/mcp/MCPConnectionFactory.ts
@@ -220,18 +220,8 @@ export class MCPConnectionFactory {
 
     connection.on('oauthRequired', oauthHandler);
 
-    /** Handler reference for cleanup when connection state changes to disconnected */
-    const cleanupHandler = (state: string) => {
-      if (state === 'disconnected') {
-        connection.removeListener('oauthRequired', oauthHandler);
-        connection.removeListener('connectionChange', cleanupHandler);
-      }
-    };
-    connection.on('connectionChange', cleanupHandler);
-
     return () => {
       connection.removeListener('oauthRequired', oauthHandler);
-      connection.removeListener('connectionChange', cleanupHandler);
     };
   }