diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs b/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs
index 95e3d16fd4..22685bbb3c 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs
@@ -29,7 +29,20 @@ public override async IAsyncEnumerable<AgentRunResponseUpdate> RunStreamingAsync
         };
 
         var openAiClient = new ChatClient(model: "myModel!", credential: new ApiKeyCredential("dummy-key"), options: options).AsIChatClient();
-        await foreach (var update in openAiClient.GetStreamingResponseAsync(messages, cancellationToken: cancellationToken))
+
+        var chatOptions = new ChatOptions()
+        {
+            ConversationId = threadId,
+            RawRepresentationFactory = _ => new ChatCompletionOptions()
+            {
+                Metadata =
+                {
+                    { "entity_id", agentName }
+                }
+            },
+        };
+
+        await foreach (var update in openAiClient.GetStreamingResponseAsync(messages, options: chatOptions, cancellationToken: cancellationToken))
         {
             yield return new AgentRunResponseUpdate(update);
         }
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs b/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs
index 7cc85b97c3..ea99e0bc65 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs
@@ -30,7 +30,14 @@ public override async IAsyncEnumerable<AgentRunResponseUpdate> RunStreamingAsync
         var openAiClient = new OpenAIResponseClient(model: agentName, credential: new ApiKeyCredential("dummy-key"), options: options).AsIChatClient();
         var chatOptions = new ChatOptions()
         {
-            ConversationId = threadId
+            ConversationId = threadId,
+            RawRepresentationFactory = _ => new ResponseCreationOptions()
+            {
+                Metadata =
+                {
+                    { "entity_id", agentName }
+                }
+            },
         };
 
         await foreach (var update in openAiClient.GetStreamingResponseAsync(messages, chatOptions, cancellationToken: cancellationToken))