diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs b/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
index 7079c6429..138d50844 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
@@ -82,8 +82,8 @@ private async Task HandleWebSocket(IServiceProvider services, string agentId, st
             var (eventType, data) = MapEvents(conn, receivedText);
             if (eventType == "start")
             {
-                var states = InitStates(data);
-                await ConnectToModel(hub, webSocket, states);
+                var request = InitRequest(data);
+                await ConnectToModel(hub, webSocket, request?.States);
             }
             else if (eventType == "media")
             {
@@ -157,16 +157,15 @@ private void InitEvents(RealtimeHubConnection conn)
             });
     }
 
-    private List<MessageState> InitStates(string data)
+    private ChatStreamRequest? InitRequest(string data)
     {
         try
         {
-            var states = JsonSerializer.Deserialize<List<MessageState>>(data, BotSharpOptions.defaultJsonOptions);
-            return states ?? [];
+            return JsonSerializer.Deserialize<ChatStreamRequest>(data, BotSharpOptions.defaultJsonOptions);
         }
         catch
         {
-            return [];
+            return null;
         }
     }
 }
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs
new file mode 100644
index 000000000..1a72d7dce
--- /dev/null
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs
@@ -0,0 +1,10 @@
+using BotSharp.Abstraction.Models;
+using System.Text.Json.Serialization;
+
+namespace BotSharp.Plugin.ChatHub.Models.Stream;
+
+public class ChatStreamRequest
+{
+    [JsonPropertyName("states")]
+    public List<MessageState> States { get; set; } = [];
+}