diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
index 4bca97ffa..07a3ff8f7 100644
--- a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
@@ -278,7 +278,8 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD
             }
             else if (message.Role == ChatRole.User)
             {
-                var userMessage = new ChatRequestUserMessage(message.Payload ?? message.Content)
+                var text = !string.IsNullOrWhiteSpace(message.Payload) ? message.Payload : message.Content;
+                var userMessage = new ChatRequestUserMessage(text)
                 {
                     // To display Planner name in log
                     Name = message.FunctionName,