CryptoExchange.Net/Sockets/MessageMatcher.cs

@@ -47,7 +47,7 @@ namespace CryptoExchange.Net.Sockets
         /// </summary>
         public static MessageMatcher Create<T>(string value)
         {
-            return new MessageMatcher(new MessageHandlerLink<T>(MessageLinkType.Full, value, (con, msg) => new CallResult<T>(default, msg.OriginalData, null)));
+            return new MessageMatcher(new MessageHandlerLink<T>(MessageLinkType.Full, value, (con, msg) => CallResult.SuccessResult));
         }
 
         /// <summary>

CryptoExchange.Net/Sockets/Query.cs

@@ -187,8 +187,11 @@ namespace CryptoExchange.Net.Sockets
                 return CallResult.SuccessResult;
 
             CurrentResponses++;
-            if (CurrentResponses == RequiredResponses)            
-                Response = message.Data;            
+            if (CurrentResponses == RequiredResponses)
+            {
+                Completed = true;
+                Response = message.Data;
+            }
 
             if (Result?.Success != false)
                 // If an error result is already set don't override that
@@ -196,7 +199,6 @@ namespace CryptoExchange.Net.Sockets
 
             if (CurrentResponses == RequiredResponses)
             {
-                Completed = true;
                 _event.Set();
                 if (ContinueAwaiter != null)
                     await ContinueAwaiter.WaitAsync().ConfigureAwait(false);