diff --git a/app.py b/app.py
index aab516842f..ecebee86ea 100644
--- a/app.py
+++ b/app.py
@@ -353,7 +353,7 @@ async def generate():
 
 async def conversation_internal(request_body, request_headers):
     try:
-        if app_settings.azure_openai.stream:
+        if app_settings.azure_openai.stream and not app_settings.base_settings.use_promptflow:
             result = await stream_chat_request(request_body, request_headers)
             response = await make_response(format_as_ndjson(result))
             response.timeout = None