diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs b/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
index 90318ff2..8eaac28b 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
@@ -70,6 +70,8 @@ public class ChatStreamMiddleware
                 continue;
             }
 
+            Console.WriteLine($"Close status: {result.CloseStatus}, End of message: {result.EndOfMessage}");
+
             var receivedText = Encoding.UTF8.GetString(buffer, 0, result.Count);
             if (string.IsNullOrEmpty(receivedText))
             {
@@ -92,11 +94,12 @@ public class ChatStreamMiddleware
             else if (eventType == "disconnect")
             {
                 await hub.Completer.Disconnect();
+                break;
             }
         }
         while (!webSocket.CloseStatus.HasValue);
 
-        await webSocket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None);
+        await webSocket.CloseAsync(result?.CloseStatus ?? WebSocketCloseStatus.NormalClosure, result?.CloseStatusDescription, CancellationToken.None);
     }
 
     private async Task ConnectToModel(IRealtimeHub hub, WebSocket webSocket)
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs
index 064718b4..d1847432 100644
--- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -78,7 +78,6 @@ public class RealTimeCompletionProvider : IRealTimeCompletion
 
     public async Task Disconnect()
     {
-
         _session?.Disconnect();
     }