diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index c2f1805f7c3..3cfd83b6a13 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -312,9 +312,9 @@ class MCPServerManager:
                     server_id,
                     _discovered_token_url,
                 )
-            resolved_token_url = _explicit_token_url or (
-                _discovered_token_url if not _has_client_creds else None
-            )
+                resolved_token_url = None
+            else:
+                resolved_token_url = _explicit_token_url or _discovered_token_url
             resolved_registration_url = server_config.get("registration_url") or (
                 mcp_oauth_metadata.registration_url if mcp_oauth_metadata else None
             )
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
index 54ef7917617..57fd40077ee 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
@@ -762,8 +762,6 @@ class TestMCPServerManager:
             assert server_url == "https://example.com/mcp"
             return discovered_metadata
 
-        manager._descovery_metadata = fake_discovery  # type: ignore[attr-defined]
-
         config = {
             "example": {
                 "url": "https://example.com/mcp",
@@ -774,7 +772,8 @@ class TestMCPServerManager:
             }
         }
 
-        await manager.load_servers_from_config(config)
+        with unittest.mock.patch.object(manager, "_descovery_metadata", side_effect=fake_discovery):
+            await manager.load_servers_from_config(config)
 
         server = next(iter(manager.config_mcp_servers.values()))
         assert server.scopes == ["config"]  # config overrides discovery