diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
index 1f178fc18..ae5a803b8 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -27,7 +27,10 @@ public async Task<bool> SendMessage(string agentId,
 #endif
 
         message.CurrentAgentId = agent.Id;
-        message.SenderId = _user.Id;
+        if (string.IsNullOrEmpty(message.SenderId))
+        {
+            message.SenderId = _user.Id;
+        }
 
         _storage.Append(_conversationId, message);