diff --git a/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs b/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs
index 1d4e12086d..cd15c41358 100644
--- a/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs
+++ b/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs
@@ -227,6 +227,9 @@ public IAsyncEnumerable<ResponseMessage<T>> SubmitAsync<T>(RequestMessage messag
 
                     static async IAsyncEnumerable<ResponseMessage<T>> Core(RequestMessage message, WebSocketGremlinqClient @this, [EnumeratorCancellation] CancellationToken ct = default)
                     {
+                        if (@this._client.CloseStatus is not null)
+                            throw new ObjectDisposedException(nameof(WebSocketGremlinqClient));
+
                         using (var channel = new Channel<T>(@this))
                         {
                             using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(ct, @this._cts.Token))
@@ -307,9 +310,9 @@ private async Task SendCore(RequestMessage requestMessage, CancellationToken ct)
                             {
                                 using (buffer)
                                 {
-                                    await _client.SendAsync(buffer.Memory, WebSocketMessageType.Binary, true, ct);
-                                }
-                            }
+                                        await _client.SendAsync(buffer.Memory, WebSocketMessageType.Binary, true, ct);
+                                    }
+                                    }
                             else
                                 throw new InvalidOperationException();
                         }