diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
index 59ce88c2..ba739dac 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -40,10 +40,10 @@ public partial class ConversationService
         routing.Context.Push(agent.Id, reason: "request started");
 
         // Save payload in order to assign the payload before hook is invoked
-        if (replyMessage != null && !string.IsNullOrEmpty(replyMessage.Payload))
-        {
-            message.Payload = replyMessage.Payload;
-        }
+        // if (replyMessage != null && !string.IsNullOrEmpty(replyMessage.Payload))
+        // {
+        //     message.Payload = replyMessage.Payload;
+        // }
 
         // Before chat completion hook
         hooks = ReOrderConversationHooks(hooks);
diff --git a/src/Infrastructure/BotSharp.Core/Routing/RoutingService.GetConversationContent.cs b/src/Infrastructure/BotSharp.Core/Routing/RoutingService.GetConversationContent.cs
index f95b3f37..f8efab46 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/RoutingService.GetConversationContent.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/RoutingService.GetConversationContent.cs
@@ -16,15 +16,7 @@ public partial class RoutingService
                 role = agent.Name;
             }
 
-            if (role == AgentRole.User)
-            {
-                conversation += $"{role}: {dialog.Payload ?? dialog.Content}\r\n";
-            }
-            else
-            {
-                // Assistant reply deosn't need help with payload
-                conversation += $"{role}: {dialog.Content}\r\n";
-            }
+            conversation += $"{role}: {dialog.Payload ?? dialog.Content}\r\n";
         }
 
         return conversation;
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
index 3384e3b7..b77a47c1 100644
--- a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -312,7 +312,7 @@ public class ChatCompletionProvider : IChatCompletion
             }
             else if (message.Role == AgentRole.Assistant)
             {
-                messages.Add(new AssistantChatMessage(message.Content));
+                messages.Add(new AssistantChatMessage(message.Payload ?? message.Content));
             }
         }
 
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
index 50151513..1c9ca641 100644
--- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -290,7 +290,7 @@ public class ChatCompletionProvider : IChatCompletion
             }
             else if (message.Role == AgentRole.Assistant)
             {
-                messages.Add(new AssistantChatMessage(message.Content));
+                messages.Add(new AssistantChatMessage(message.Payload ?? message.Content));
             }
         }