diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
index 19bcb5a7..86561366 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -88,7 +88,7 @@ public class ConversationController : ControllerBase
                     Sender = UserViewModel.FromUser(user)
                 });
             }
-            else
+            else if (message.Role == AgentRole.Assistant)
             {
                 var agent = await agentService.GetAgent(message.CurrentAgentId);
                 dialogs.Add(new ChatResponseModel