diff --git a/src/main/kotlin/ee/carlrobert/codegpt/agent/clients/CustomOpenAILLMClient.kt b/src/main/kotlin/ee/carlrobert/codegpt/agent/clients/CustomOpenAILLMClient.kt
index c787e959..261d9fd2 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/agent/clients/CustomOpenAILLMClient.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/agent/clients/CustomOpenAILLMClient.kt
@@ -235,7 +235,7 @@ class CustomOpenAILLMClient(
     ): String {
         val state = requireChatState()
         val customParams: CustomOpenAIParams = params.toCustomOpenAIParams(state)
-        val streamRequest = state.shouldStream()
+        val streamRequest = stream && state.shouldStream()
         val additionalProperties = buildCustomOpenAIAdditionalProperties(
             body = state.body,
             messages = messages,