diff --git a/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs b/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs
index 006287c023..3bde16e6e6 100644
--- a/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs
+++ b/dotnet/src/Microsoft.Agents.Workflows/Specialized/AIAgentHostExecutor.cs
@@ -95,6 +95,8 @@ internal class AIAgentHostExecutor : Executor
         IAsyncEnumerable<AgentRunResponseUpdate> agentStream = this._agent.RunStreamingAsync(this._pendingMessages, this.EnsureThread(context));
 
         List<AgentRunResponseUpdate> updates = new();
+        ChatMessage? currentStreamingMessage = null;
+
         await foreach (AgentRunResponseUpdate update in agentStream.ConfigureAwait(false))
         {
             if (emitEvents)
@@ -108,18 +110,32 @@ internal class AIAgentHostExecutor : Executor
             // workflow.
 
             updates.Add(update);
-            ChatMessage message = new(update.Role ?? ChatRole.Assistant, update.Contents)
-            {
-                AuthorName = update.AuthorName,
-                CreatedAt = update.CreatedAt,
-                MessageId = update.MessageId,
-                RawRepresentation = update.RawRepresentation,
-                AdditionalProperties = update.AdditionalProperties
-            };
 
-            await context.SendMessageAsync(message).ConfigureAwait(false);
+            if (currentStreamingMessage == null || currentStreamingMessage.MessageId != update.MessageId)
+            {
+                await PublishCurrentMessageAsync().ConfigureAwait(false);
+                currentStreamingMessage = new(update.Role ?? ChatRole.Assistant, update.Contents)
+                {
+                    AuthorName = update.AuthorName,
+                    CreatedAt = update.CreatedAt,
+                    MessageId = update.MessageId,
+                    RawRepresentation = update.RawRepresentation,
+                    AdditionalProperties = update.AdditionalProperties
+                };
+            }
         }
 
+        await PublishCurrentMessageAsync().ConfigureAwait(false);
         await context.SendMessageAsync(token).ConfigureAwait(false);
+
+        async ValueTask PublishCurrentMessageAsync()
+        {
+            if (currentStreamingMessage != null)
+            {
+                await context.SendMessageAsync(currentStreamingMessage).ConfigureAwait(false);
+            }
+
+            currentStreamingMessage = null;
+        }
     }
 }