From 9b6c7c8bf0e2e0e3218caa8a18b29b17bb8bf566 Mon Sep 17 00:00:00 2001
From: Mateo Wang <277851410+mateo-berri@users.noreply.github.com>
Date: Wed, 9 Sep 2026 09:17:14 -0700
Subject: [PATCH] Apply suggestion from @greptile-apps[bot]

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
---
 litellm/proxy/_experimental/mcp_server/rest_endpoints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/litellm/proxy/_experimental/mcp_server/rest_endpoints.py b/litellm/proxy/_experimental/mcp_server/rest_endpoints.py
index 63badc6f703..31252479445 100644
--- a/litellm/proxy/_experimental/mcp_server/rest_endpoints.py
+++ b/litellm/proxy/_experimental/mcp_server/rest_endpoints.py
@@ -1408,7 +1408,7 @@ if MCP_AVAILABLE:
             raise
         except BaseException as e:
             effective_timeout: Final = (
-                min(request.timeout or MCP_CLIENT_TIMEOUT, timeout_seconds)
+                min(request.timeout if request.timeout is not None else MCP_CLIENT_TIMEOUT, timeout_seconds)
                 if any(
                     isinstance(cause, McpError) and _as_read_timeout(cause) is not None
                     for cause in iter_exception_tree(e)