diff --git a/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx b/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx
index f9531bde50f..8719bac2441 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx
@@ -37,6 +37,11 @@ const OpenAPIFormSection: React.FC<OpenAPIFormSectionProps> = ({
       updates.auth_type = AUTH_TYPE.OAUTH2;
       updates.authorization_url = entry.oauth.authorization_url;
       updates.token_url = entry.oauth.token_url;
+    } else {
+      // Clear stale OAuth config from previous preset selection
+      updates.auth_type = undefined;
+      updates.authorization_url = undefined;
+      updates.token_url = undefined;
     }
     form.setFieldsValue(updates);
     onValuesChange(updates);
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 e6b867591e2..360bb893b52 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
@@ -396,13 +396,23 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
         )}
 
         {/* No tools state */}
-        {!isLoadingTools && !toolsError && tools.length === 0 && canFetchTools && (!keyTools || keyTools.length === 0) && (
-          <div className="text-center py-6 text-gray-400 border rounded-lg border-dashed">
-            <ToolOutlined className="text-2xl mb-2" />
-            <Text>No tools available for configuration</Text>
-            <br />
-            <Text className="text-sm">Connect to an MCP server with tools to configure them</Text>
-          </div>
+        {!isLoadingTools && !toolsError && tools.length === 0 && canFetchTools && (
+          keyTools && keyTools.length > 0 ? (
+            <div className="text-center py-4 text-gray-400 border rounded-lg border-dashed">
+              <ToolOutlined className="text-2xl mb-2" />
+              <Text>No tools loaded from spec</Text>
+              <Text className="text-sm block mt-1">
+                Expected tools: {keyTools.map((t) => t.name).join(", ")}
+              </Text>
+            </div>
+          ) : (
+            <div className="text-center py-6 text-gray-400 border rounded-lg border-dashed">
+              <ToolOutlined className="text-2xl mb-2" />
+              <Text>No tools available for configuration</Text>
+              <br />
+              <Text className="text-sm">Connect to an MCP server with tools to configure them</Text>
+            </div>
+          )
         )}
 
         {/* Incomplete form state */}