diff --git a/CryptoExchange.Net/Objects/Sockets/DataEvent.cs b/CryptoExchange.Net/Objects/Sockets/DataEvent.cs
index 88a7d71..15caa7a 100644
--- a/CryptoExchange.Net/Objects/Sockets/DataEvent.cs
+++ b/CryptoExchange.Net/Objects/Sockets/DataEvent.cs
@@ -170,6 +170,6 @@ namespace CryptoExchange.Net.Objects.Sockets
         }
 
         /// <inheritdoc />
-        public override string ToString() => base.ToString().TrimEnd('-') + Data?.ToString();
+        public override string ToString() => base.ToString().TrimEnd(' ', '-') + " - " + Data?.ToString();
     }
 }
diff --git a/CryptoExchange.Net/Sockets/Default/SocketConnection.cs b/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
index e2f4915..829724e 100644
--- a/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
+++ b/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
@@ -1137,7 +1137,7 @@ namespace CryptoExchange.Net.Sockets.Default
                 return CallResult.SuccessResult;
             }
 
-            subQuery.OnComplete = () =>
+            var subCompleteHandler = () =>
             {
                 subscription.Status = subQuery.Result!.Success ? SubscriptionStatus.Subscribed : SubscriptionStatus.Pending;
                 subscription.HandleSubQueryResponse(this, subQuery.Response);
@@ -1150,6 +1150,7 @@ namespace CryptoExchange.Net.Sockets.Default
                     }, false);
                 }
             };
+            subQuery.OnComplete = subCompleteHandler;
 
             var subQueryResult = await SendAndWaitQueryAsync(subQuery).ConfigureAwait(false);
             if (!subQueryResult)
@@ -1161,6 +1162,9 @@ namespace CryptoExchange.Net.Sockets.Default
                 return new CallResult<UpdateSubscription>(subQueryResult.Error!);
             }
 
+            if (!subQuery.ExpectsResponse)
+                subCompleteHandler();
+
             return subQueryResult;
         }