diff --git a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/spring/OpenAiChatModel.java b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/spring/OpenAiChatModel.java
index 3d6784018..971cc7192 100644
--- a/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/spring/OpenAiChatModel.java
+++ b/foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/spring/OpenAiChatModel.java
@@ -187,7 +187,10 @@ private static Generation toGeneration(
   @Nonnull
   protected static OpenAiChatCompletionRequest extractOptions(
       @Nonnull OpenAiChatCompletionRequest request, @Nonnull final ChatOptions options) {
-    request = request.withStop(options.getStopSequences()).withMaxTokens(options.getMaxTokens());
+    request =
+        request
+            .withStop(options.getStopSequences())
+            .withMaxCompletionTokens(options.getMaxTokens());
     if (options.getTemperature() != null) {
       request = request.withTemperature(BigDecimal.valueOf(options.getTemperature()));
     }