diff --git a/CryptoExchange.Net/Clients/SocketApiClient.cs b/CryptoExchange.Net/Clients/SocketApiClient.cs
index 4dfddcf..f3f95c9 100644
--- a/CryptoExchange.Net/Clients/SocketApiClient.cs
+++ b/CryptoExchange.Net/Clients/SocketApiClient.cs
@@ -356,6 +356,9 @@ namespace CryptoExchange.Net.Clients
                         return new CallResult<UpdateSubscription>(subResult.Error!);
                     }
                 }
+
+                if (!subQuery.ExpectsResponse)
+                    HandleSubscriptionComplete(true, null);
             }
             else 
             {
diff --git a/CryptoExchange.Net/Sockets/Default/SocketConnection.cs b/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
index 98178e7..196990d 100644
--- a/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
+++ b/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
@@ -1249,6 +1249,13 @@ namespace CryptoExchange.Net.Sockets.Default
                     };
 
                     taskList.Add(SendAndWaitQueryAsync(subQuery));
+
+                    if (!subQuery.ExpectsResponse)
+                    {
+                        // If there won't be an answer we can immediately set this
+                        subscription.Status = SubscriptionStatus.Subscribed;
+                        subscription.HandleSubQueryResponse(this, null);
+                    }
                 }
 
                 await Task.WhenAll(taskList).ConfigureAwait(false);