diff --git a/litellm/proxy/_experimental/mcp_server/server.py b/litellm/proxy/_experimental/mcp_server/server.py index 4f0e4465ef3..861fe36eacc 100644 --- a/litellm/proxy/_experimental/mcp_server/server.py +++ b/litellm/proxy/_experimental/mcp_server/server.py @@ -1633,8 +1633,12 @@ if MCP_AVAILABLE: if registry_pick and mcp_servers is not None and len(mcp_servers) == 1 else () ) - granted = operations.global_mcp_server_manager.get_mcp_server_answering_to( - server_name, client_ip=client_ip, among=allowed_single + granted = ( + operations.global_mcp_server_manager.get_mcp_server_answering_to( + server_name, client_ip=client_ip, among=allowed_single + ) + if allowed_single + else None ) server = granted if granted is not None else registry_pick granted_single = granted is not None