From 549f48bc7aaadca4ad653a3892c1e35b3c1a50d7 Mon Sep 17 00:00:00 2001
From: Aymen El Amri <5774128+eon01@users.noreply.github.com>
Date: Tue, 24 Feb 2026 20:04:03 +0100
Subject: [PATCH] fix: skip max_completion_tokens when maxTokens is None
 (#3284)

---
 src/fastmcp/client/sampling/handlers/openai.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fastmcp/client/sampling/handlers/openai.py b/src/fastmcp/client/sampling/handlers/openai.py
index 362e05905..38f5ff356 100644
--- a/src/fastmcp/client/sampling/handlers/openai.py
+++ b/src/fastmcp/client/sampling/handlers/openai.py
@@ -84,8 +84,9 @@ class OpenAISamplingHandler:
         kwargs: dict[str, Any] = {
             "model": model,
             "messages": openai_messages,
-            "max_completion_tokens": params.maxTokens,
         }
+        if params.maxTokens is not None:
+            kwargs["max_completion_tokens"] = params.maxTokens
         if params.temperature is not None:
             kwargs["temperature"] = params.temperature
         if params.stopSequences: