diff --git a/dotnet/src/Microsoft.Agents.AI.Hosting.OpenAI/ChatCompletions/Models/ChatCompletionRequestMessage.cs b/dotnet/src/Microsoft.Agents.AI.Hosting.OpenAI/ChatCompletions/Models/ChatCompletionRequestMessage.cs
index 3e9483c616..4fe9c43aa9 100644
--- a/dotnet/src/Microsoft.Agents.AI.Hosting.OpenAI/ChatCompletions/Models/ChatCompletionRequestMessage.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.OpenAI/ChatCompletions/Models/ChatCompletionRequestMessage.cs
@@ -39,14 +39,15 @@ internal abstract record ChatCompletionRequestMessage
     /// <exception cref="InvalidOperationException">Thrown when the content is neither text nor AI contents.</exception>
     public virtual ChatMessage ToChatMessage()
     {
+        var role = new ChatRole(this.Role);
         if (this.Content.IsText)
         {
-            return new(ChatRole.User, this.Content.Text);
+            return new(role, this.Content.Text);
         }
         else if (this.Content.IsContents)
         {
             var aiContents = this.Content.Contents.Select(MessageContentPartConverter.ToAIContent).Where(c => c is not null).ToList();
-            return new ChatMessage(ChatRole.User, aiContents!);
+            return new ChatMessage(role, aiContents!);
         }
 
         throw new InvalidOperationException("MessageContent has no value");
@@ -167,7 +168,7 @@ public override ChatMessage ToChatMessage()
     {
         if (this.Content.IsText)
         {
-            return new(ChatRole.User, this.Content.Text);
+            return new(new ChatRole(this.Role), this.Content.Text);
         }
 
         throw new InvalidOperationException("FunctionMessage Content must be text");