diff --git a/client/src/components/Chat/Messages/Content/Part.tsx b/client/src/components/Chat/Messages/Content/Part.tsx
index 457e79b9d1..9a8c226a7f 100644
--- a/client/src/components/Chat/Messages/Content/Part.tsx
+++ b/client/src/components/Chat/Messages/Content/Part.tsx
@@ -31,10 +31,14 @@ const Part = memo(({ part, isSubmitting, showCursor, messageId, isCreatedByUser
   if (part.type === ContentTypes.ERROR) {
     return <ErrorMessage text={part[ContentTypes.TEXT].value} className="my-2" />;
   } else if (part.type === ContentTypes.TEXT) {
-    const text = typeof part.text === 'string' ? part.text : part.text.value;
+    const text = typeof part.text === 'string' ? part.text : (part.text as { value: string }).value;
+
     if (typeof text !== 'string') {
       return null;
     }
+    if (part.tool_call_ids != null && !text) {
+      return null;
+    }
     return (
       <Container>
         <Text
@@ -55,7 +59,7 @@ const Part = memo(({ part, isSubmitting, showCursor, messageId, isCreatedByUser
     if ('args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL)) {
       return (
         <ToolCall
-          args={toolCall.args}
+          args={toolCall.args ?? ''}
           name={toolCall.name ?? ''}
           output={toolCall.output ?? ''}
           initialProgress={toolCall.progress ?? 0.1}
diff --git a/client/src/hooks/SSE/useStepHandler.ts b/client/src/hooks/SSE/useStepHandler.ts
index 84b9071543..40b5f18598 100644
--- a/client/src/hooks/SSE/useStepHandler.ts
+++ b/client/src/hooks/SSE/useStepHandler.ts
@@ -19,6 +19,8 @@ type TStepEvent = {
   data: Agents.MessageDeltaEvent | Agents.RunStep | Agents.ToolEndEvent;
 };
 
+type MessageDeltaUpdate = { type: ContentTypes.TEXT; text: string; tool_call_ids?: string[] };
+
 type AllContentTypes =
   | ContentTypes.TEXT
   | ContentTypes.TOOL_CALL
@@ -55,11 +57,16 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
       ContentTypes.TEXT in contentPart &&
       typeof contentPart.text === 'string'
     ) {
-      const currentContent = updatedContent[index] as { type: ContentTypes.TEXT; text: string };
-      updatedContent[index] = {
+      const currentContent = updatedContent[index] as MessageDeltaUpdate;
+      const update: MessageDeltaUpdate = {
         type: ContentTypes.TEXT,
         text: (currentContent.text || '') + contentPart.text,
       };
+
+      if (contentPart.tool_call_ids != null) {
+        update.tool_call_ids = contentPart.tool_call_ids;
+      }
+      updatedContent[index] = update;
     } else if (contentType === ContentTypes.IMAGE_URL && 'image_url' in contentPart) {
       const currentContent = updatedContent[index] as {
         type: ContentTypes.IMAGE_URL;
diff --git a/packages/data-provider/src/types/agents.ts b/packages/data-provider/src/types/agents.ts
index d0f188eca7..d66fa63b9e 100644
--- a/packages/data-provider/src/types/agents.ts
+++ b/packages/data-provider/src/types/agents.ts
@@ -10,6 +10,7 @@ export namespace Agents {
   export type MessageContentText = {
     type: ContentTypes.TEXT;
     text: string;
+    tool_call_ids?: string[];
   };
 
   export type MessageContentImageUrl = {
diff --git a/packages/data-provider/src/types/assistants.ts b/packages/data-provider/src/types/assistants.ts
index 7c70258e74..ec66fa8b48 100644
--- a/packages/data-provider/src/types/assistants.ts
+++ b/packages/data-provider/src/types/assistants.ts
@@ -381,7 +381,7 @@ export type ContentPart = (
 
 export type TMessageContentParts =
   | { type: ContentTypes.ERROR; text: Text & PartMetadata }
-  | { type: ContentTypes.TEXT; text: string | (Text & PartMetadata) }
+  | { type: ContentTypes.TEXT; text: string; tool_call_ids?: string[] | (Text & PartMetadata) }
   | {
       type: ContentTypes.TOOL_CALL;
       tool_call: (