diff --git a/src/features/claude-code-mcp-loader/loader.ts b/src/features/claude-code-mcp-loader/loader.ts
index 49c56ca2f..7be6a9ac7 100644
--- a/src/features/claude-code-mcp-loader/loader.ts
+++ b/src/features/claude-code-mcp-loader/loader.ts
@@ -59,7 +59,10 @@ export function getSystemMcpServerNames(): Set<string> {
       if (!config?.mcpServers) continue
 
       for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
-        if (serverConfig.disabled) continue
+        if (serverConfig.disabled) {
+          names.delete(name)
+          continue
+        }
         if (!shouldLoadMcpServer(serverConfig, cwd)) continue
         names.add(name)
       }