diff --git a/CryptoExchange.Net/Sockets/Default/SocketConnection.cs b/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
index 4d93e54..89bfa7a 100644
--- a/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
+++ b/CryptoExchange.Net/Sockets/Default/SocketConnection.cs
@@ -1114,6 +1114,7 @@ namespace CryptoExchange.Net.Sockets.Default
                 return;
 
             await SendAndWaitQueryAsync(unsubscribeRequest).ConfigureAwait(false);
+            subscription.HandleUnsubQueryResponse(this, unsubscribeRequest.Response);
             _logger.SubscriptionUnsubscribed(SocketId, subscription.Id);
         }
 
@@ -1127,7 +1128,7 @@ namespace CryptoExchange.Net.Sockets.Default
                 return CallResult.SuccessResult;
 
             var result = await SendAndWaitQueryAsync(subQuery).ConfigureAwait(false);
-            subscription.HandleSubQueryResponse(this, subQuery.Response!);
+            subscription.HandleSubQueryResponse(this, subQuery.Response);
             return result;
         }
 
diff --git a/CryptoExchange.Net/Sockets/Default/Subscription.cs b/CryptoExchange.Net/Sockets/Default/Subscription.cs
index 2cc1a56..ebf9295 100644
--- a/CryptoExchange.Net/Sockets/Default/Subscription.cs
+++ b/CryptoExchange.Net/Sockets/Default/Subscription.cs
@@ -149,8 +149,7 @@ namespace CryptoExchange.Net.Sockets.Default
         /// <summary>
         /// Handle an unsubscription query response
         /// </summary>
-        #warning ?
-        public virtual void HandleUnsubQueryResponse(SocketConnection connection, object message) { }
+        public virtual void HandleUnsubQueryResponse(SocketConnection connection, object? message) { }
 
         /// <summary>
         /// Create a new unsubscription query