diff --git a/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs b/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs
index 7f4fa5202..cf7344180 100644
--- a/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs
+++ b/src/Providers.Core/Factory/WebSocketGremlinqClientFactory.cs
@@ -125,10 +125,7 @@ public async IAsyncEnumerator<ResponseMessage<T>> GetAsyncEnumerator(Cancellatio
                     {
                         await using (ct.Register(Dispose))
                         {
-                            //TODO: Should ConfigureAwait be called ?
-#pragma warning disable CA2007 // Consider calling ConfigureAwait on the awaited task
-                            if (await new ValueTask<ResponseAndQueueUnion<T>?>(this, 0) is { } union)
-#pragma warning restore CA2007 // Consider calling ConfigureAwait on the awaited task
+                            if (await new ValueTask<ResponseAndQueueUnion<T>?>(this, 0).ConfigureAwait(false) is { } union)
                             {
                                 if (union.TryGetResponse(out var response))
                                     yield return response;