diff --git a/src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs b/src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs
index 79711cb6..4b636440 100644
--- a/src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs
+++ b/src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs
@@ -15,9 +15,6 @@
 ******************************************************************************/
 
 using BotSharp.Core.Infrastructures;
-using NetTopologySuite.Index.KdTree;
-using Newtonsoft.Json.Linq;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace BotSharp.Core.SideCar.Services;
 
diff --git a/src/Infrastructure/BotSharp.Core/MessageHub/Observers/ConversationObserver.cs b/src/Infrastructure/BotSharp.Core/MessageHub/Observers/ConversationObserver.cs
index e2588c6c..1ee4b164 100644
--- a/src/Infrastructure/BotSharp.Core/MessageHub/Observers/ConversationObserver.cs
+++ b/src/Infrastructure/BotSharp.Core/MessageHub/Observers/ConversationObserver.cs
@@ -30,6 +30,8 @@ public class ConversationObserver : BotSharpObserverBase<HubObserveData<RoleDial
     public override void OnNext(HubObserveData<RoleDialogModel> value)
     {
         var conv = _services.GetRequiredService<IConversationService>();
+        var storage = _services.GetRequiredService<IConversationStorage>();
+        var routeCtx = _services.GetRequiredService<IRoutingContext>();
 
         if (value.EventName == ChatEvent.OnIndicationReceived)
         {
@@ -41,5 +43,16 @@ public class ConversationObserver : BotSharpObserverBase<HubObserveData<RoleDial
                 func(value).ConfigureAwait(false).GetAwaiter().GetResult();
             }
         }
+        else if (value.EventName == ChatEvent.OnIntermediateMessageReceivedFromAssistant)
+        {
+            var dialogs = routeCtx.GetDialogs();
+            dialogs.Add(value.Data);
+            routeCtx.SetDialogs(dialogs);
+
+            if (value.SaveDataToDb)
+            {
+                storage.Append(conv.ConversationId, value.Data);
+            }
+        }
     }
 }
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Observers/ChatHubObserver.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Observers/ChatHubObserver.cs
index 3d8bf788..bf0fee9a 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Observers/ChatHubObserver.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Observers/ChatHubObserver.cs
@@ -140,12 +140,6 @@ public class ChatHubObserver : BotSharpObserverBase<HubObserveData<RoleDialogMod
                         Role = AgentRole.Assistant
                     }
                 };
-
-                if (value.SaveDataToDb)
-                {
-                    var storage = _services.GetRequiredService<IConversationStorage>();
-                    storage.Append(conv.ConversationId, message);
-                }
                 break;
         }