From d207c45766a5a5d7c69e0925a41bf9e1ba44fdea Mon Sep 17 00:00:00 2001
From: Ishaan Jaffer <ishaanjaffer0324@gmail.com>
Date: Wed, 11 Mar 2026 20:46:04 -0700
Subject: [PATCH] fix(mcp): clear oauthConnected on deselect; null guard on
 allowedTools prop

---
 ui/litellm-dashboard/src/components/chat/MCPAppsPanel.tsx | 8 ++++++++
 .../src/components/mcp_tools/mcp_tool_configuration.tsx   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/litellm-dashboard/src/components/chat/MCPAppsPanel.tsx b/ui/litellm-dashboard/src/components/chat/MCPAppsPanel.tsx
index fb41956caa8..32d208261e2 100644
--- a/ui/litellm-dashboard/src/components/chat/MCPAppsPanel.tsx
+++ b/ui/litellm-dashboard/src/components/chat/MCPAppsPanel.tsx
@@ -182,6 +182,14 @@ const MCPAppsPanel: React.FC<Props> = ({ accessToken, selectedServers, onChange
   const handleToggle = async (serverName: string, checked: boolean, serverId?: string) => {
     if (!checked) {
       onChange(selectedServers.filter((s) => s !== serverName));
+      // Also clear from oauthConnected so the auto-enable effect doesn't re-add it.
+      if (serverId) {
+        setOauthConnected((prev) => {
+          const next = new Set(prev);
+          next.delete(serverId);
+          return next;
+        });
+      }
       return;
     }
     setTogglingOn((prev) => new Set(prev).add(serverName));
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tool_configuration.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tool_configuration.tsx
index 164ee8a458a..31f6cff326c 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tool_configuration.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tool_configuration.tsx
@@ -467,7 +467,7 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
               <McpCrudPermissionPanel
                 tools={tools}
                 searchFilter={toolSearchTerm}
-                value={allowedTools}
+                value={allowedTools ?? undefined}
                 onChange={(allowed) => onAllowedToolsChange(allowed)}
               />
             )}