diff --git a/docs/transport-event-handlers-fix.md b/docs/transport-event-handlers-fix.md
index a0e1e03..ef5adc0 100644
--- a/docs/transport-event-handlers-fix.md
+++ b/docs/transport-event-handlers-fix.md
@@ -166,8 +166,11 @@ To manually test the fix:
 ## Compatibility
 
 - **Backwards Compatible**: No breaking changes to existing functionality
-- **SDK Version**: Works with `@modelcontextprotocol/sdk` v1.20.2+
+- **SDK Version**: Requires `@modelcontextprotocol/sdk` v1.20.2 or higher (current version in use)
 - **Node.js**: Compatible with all supported Node.js versions
+- **Transport Types**: Works with SSEClientTransport, StreamableHTTPClientTransport, and StdioClientTransport
+
+Note: The `onclose` and `onerror` event handlers are part of the Transport interface in the MCP SDK and have been available since early versions. The current implementation has been tested with SDK v1.20.2.
 
 ## Future Enhancements
 
diff --git a/src/services/mcpService.ts b/src/services/mcpService.ts
index b8a7667..3bb90ed 100644
--- a/src/services/mcpService.ts
+++ b/src/services/mcpService.ts
@@ -136,6 +136,15 @@ const setupKeepAlive = (serverInfo: ServerInfo, serverConfig: ServerConfig): voi
   );
 };
 
+// Helper function to clean up server resources on disconnection
+const cleanupServerResources = (serverInfo: ServerInfo): void => {
+  // Clear keep-alive interval if it exists
+  if (serverInfo.keepAliveIntervalId) {
+    clearInterval(serverInfo.keepAliveIntervalId);
+    serverInfo.keepAliveIntervalId = undefined;
+  }
+};
+
 // Helper function to set up transport event handlers for connection monitoring
 const setupTransportEventHandlers = (serverInfo: ServerInfo): void => {
   if (!serverInfo.transport) {
@@ -145,31 +154,25 @@ const setupTransportEventHandlers = (serverInfo: ServerInfo): void => {
   // Set up onclose handler to update status when connection closes
   serverInfo.transport.onclose = () => {
     console.log(`Transport closed for server: ${serverInfo.name}`);
-    if (serverInfo.status === 'connected') {
+    // Update status to disconnected if not already in a terminal state
+    if (serverInfo.status === 'connected' || serverInfo.status === 'connecting') {
       serverInfo.status = 'disconnected';
       serverInfo.error = 'Connection closed';
     }
     
-    // Clear keep-alive interval if it exists
-    if (serverInfo.keepAliveIntervalId) {
-      clearInterval(serverInfo.keepAliveIntervalId);
-      serverInfo.keepAliveIntervalId = undefined;
-    }
+    cleanupServerResources(serverInfo);
   };
 
   // Set up onerror handler to update status on connection errors
   serverInfo.transport.onerror = (error: Error) => {
     console.error(`Transport error for server ${serverInfo.name}:`, error);
-    if (serverInfo.status === 'connected') {
+    // Update status to disconnected if not already in a terminal state
+    if (serverInfo.status === 'connected' || serverInfo.status === 'connecting') {
       serverInfo.status = 'disconnected';
       serverInfo.error = `Transport error: ${error.message}`;
     }
     
-    // Clear keep-alive interval if it exists
-    if (serverInfo.keepAliveIntervalId) {
-      clearInterval(serverInfo.keepAliveIntervalId);
-      serverInfo.keepAliveIntervalId = undefined;
-    }
+    cleanupServerResources(serverInfo);
   };
 
   console.log(`Transport event handlers set up for server: ${serverInfo.name}`);