diff --git a/src/app/endpoints/query.py b/src/app/endpoints/query.py
index d7629a02..b1cdfe57 100644
--- a/src/app/endpoints/query.py
+++ b/src/app/endpoints/query.py
@@ -18,6 +18,7 @@
     Toolgroup,
 )
 from llama_stack_client.types.model_list_response import ModelListResponse
+from llama_stack_client.types.shared.interleaved_content_item import TextContentItem
 
 from fastapi import APIRouter, HTTPException, status, Depends
 
@@ -296,7 +297,7 @@ def retrieve_response(  # pylint: disable=too-many-locals
         mcp_server.name for mcp_server in configuration.mcp_servers
     ]
     response = agent.create_turn(
-        messages=[UserMessage(role="user", content=query_request.query)],
+        messages=[UserMessage(role="user", content=[TextContentItem(type="text", text=query_request.query)])],
         session_id=conversation_id,
         documents=query_request.get_documents(),
         stream=False,
diff --git a/src/app/endpoints/streaming_query.py b/src/app/endpoints/streaming_query.py
index d322738d..bc527af4 100644
--- a/src/app/endpoints/streaming_query.py
+++ b/src/app/endpoints/streaming_query.py
@@ -562,7 +562,7 @@ async def retrieve_response(
         mcp_server.name for mcp_server in configuration.mcp_servers
     ]
     response = await agent.create_turn(
-        messages=[UserMessage(role="user", content=query_request.query)],
+        messages=[UserMessage(role="user", content=[TextContentItem(type="text", text=query_request.query)])],
         session_id=conversation_id,
         documents=query_request.get_documents(),
         stream=True,