diff --git a/Binance.API.Csharp.Client.Domain/Interfaces/IApiClient.cs b/Binance.API.Csharp.Client.Domain/Interfaces/IApiClient.cs
index 65dc01f..e1149e2 100644
--- a/Binance.API.Csharp.Client.Domain/Interfaces/IApiClient.cs
+++ b/Binance.API.Csharp.Client.Domain/Interfaces/IApiClient.cs
@@ -1,6 +1,7 @@
 using Binance.API.Csharp.Client.Models.Enums;
 using Binance.API.Csharp.Client.Models.WebSocket;
 using System.Threading.Tasks;
+using WebSocketSharp;
 using static Binance.API.Csharp.Client.Domain.Abstract.ApiClientAbstract;
 
 namespace Binance.API.Csharp.Client.Domain.Interfaces
@@ -25,7 +26,7 @@ public interface IApiClient
         /// <param name="parameters">Paremeters to send to the Websocket.</param>
         /// <param name="messageDelegate">Deletage to callback after receive a message.</param>
         /// <param name="useCustomParser">Specifies if needs to use a custom parser for the response message.</param>
-        void ConnectToWebSocket<T>(string parameters, MessageHandler<T> messageDelegate, bool useCustomParser = false);
+        WebSocket ConnectToWebSocket<T>(string parameters, MessageHandler<T> messageDelegate, bool useCustomParser = false);
 
         /// <summary>
         /// Connects to a UserData Websocket endpoint.
diff --git a/Binance.API.Csharp.Client.Domain/Interfaces/IBinanceClient.cs b/Binance.API.Csharp.Client.Domain/Interfaces/IBinanceClient.cs
index 5312215..48b3b10 100644
--- a/Binance.API.Csharp.Client.Domain/Interfaces/IBinanceClient.cs
+++ b/Binance.API.Csharp.Client.Domain/Interfaces/IBinanceClient.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using WebSocketSharp;
 using static Binance.API.Csharp.Client.Domain.Abstract.ApiClientAbstract;
 
 namespace Binance.API.Csharp.Client.Domain.Interfaces
@@ -215,7 +216,7 @@ public interface IBinanceClient
         /// </summary>
         /// <param name="symbol">Ticker symbol.</param>
         /// <param name="depthHandler">Handler to be used when a message is received.</param>
-        void ListenDepthEndpoint(string symbol, MessageHandler<DepthMessage> messageHandler);
+        WebSocket ListenDepthEndpoint(string symbol, MessageHandler<DepthMessage> messageHandler);
 
         /// <summary>
         /// Listen to the Kline endpoint.
@@ -223,14 +224,14 @@ public interface IBinanceClient
         /// <param name="symbol">Ticker symbol.</param>
         /// <param name="interval">Time interval to retreive.</param>
         /// <param name="klineHandler">Handler to be used when a message is received.</param>
-        void ListenKlineEndpoint(string symbol, TimeInterval interval, MessageHandler<KlineMessage> messageHandler);
+        WebSocket ListenKlineEndpoint(string symbol, TimeInterval interval, MessageHandler<KlineMessage> messageHandler);
 
         /// <summary>
         /// Listen to the Trades endpoint.
         /// </summary>
         /// <param name="symbol">Ticker symbol.</param>
         /// <param name="tradeHandler">Handler to be used when a message is received.</param>
-        void ListenTradeEndpoint(string symbol, MessageHandler<AggregateTradeMessage> messageHandler);
+        WebSocket ListenTradeEndpoint(string symbol, MessageHandler<AggregateTradeMessage> messageHandler);
 
         /// <summary>
         /// Listen to the User Data endpoint.
diff --git a/Binance.API.Csharp.Client/ApiClient.cs b/Binance.API.Csharp.Client/ApiClient.cs
index 7601abe..3e2c3bf 100644
--- a/Binance.API.Csharp.Client/ApiClient.cs
+++ b/Binance.API.Csharp.Client/ApiClient.cs
@@ -97,7 +97,7 @@ public async Task<T> CallAsync<T>(ApiMethod method, string endpoint, bool isSign
         /// <param name="parameters">Paremeters to send to the Websocket.</param>
         /// <param name="messageDelegate">Deletage to callback after receive a message.</param>
         /// <param name="useCustomParser">Specifies if needs to use a custom parser for the response message.</param>
-        public void ConnectToWebSocket<T>(string parameters, MessageHandler<T> messageHandler, bool useCustomParser = false)
+        public WebSocket ConnectToWebSocket<T>(string parameters, MessageHandler<T> messageHandler, bool useCustomParser = false)
         {
             var finalEndpoint = _webSocketEndpoint + parameters;
 
@@ -132,6 +132,7 @@ public void ConnectToWebSocket<T>(string parameters, MessageHandler<T> messageHa
 
             ws.Connect();
             _openSockets.Add(ws);
+            return ws;
         }
 
         /// <summary>
diff --git a/Binance.API.Csharp.Client/BinanceClient.cs b/Binance.API.Csharp.Client/BinanceClient.cs
index c37503a..999b9fd 100644
--- a/Binance.API.Csharp.Client/BinanceClient.cs
+++ b/Binance.API.Csharp.Client/BinanceClient.cs
@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using WebSocketSharp;
 
 namespace Binance.API.Csharp.Client
 {
@@ -563,7 +564,7 @@ public async Task<dynamic> CloseUserStream(string listenKey)
         /// </summary>
         /// <param name="symbol">Ticker symbol.</param>
         /// <param name="depthHandler">Handler to be used when a message is received.</param>
-        public void ListenDepthEndpoint(string symbol, ApiClientAbstract.MessageHandler<DepthMessage> depthHandler)
+        public WebSocket ListenDepthEndpoint(string symbol, ApiClientAbstract.MessageHandler<DepthMessage> depthHandler)
         {
             if (string.IsNullOrWhiteSpace(symbol))
             {
@@ -571,7 +572,7 @@ public void ListenDepthEndpoint(string symbol, ApiClientAbstract.MessageHandler<
             }
 
             var param = symbol + "@depth";
-            _apiClient.ConnectToWebSocket(param, depthHandler, true);
+            return _apiClient.ConnectToWebSocket(param, depthHandler, true);
         }
 
         /// <summary>
@@ -580,7 +581,7 @@ public void ListenDepthEndpoint(string symbol, ApiClientAbstract.MessageHandler<
         /// <param name="symbol">Ticker symbol.</param>
         /// <param name="interval">Time interval to retreive.</param>
         /// <param name="klineHandler">Handler to be used when a message is received.</param>
-        public void ListenKlineEndpoint(string symbol, TimeInterval interval, ApiClientAbstract.MessageHandler<KlineMessage> klineHandler)
+        public WebSocket ListenKlineEndpoint(string symbol, TimeInterval interval, ApiClientAbstract.MessageHandler<KlineMessage> klineHandler)
         {
             if (string.IsNullOrWhiteSpace(symbol))
             {
@@ -588,7 +589,7 @@ public void ListenKlineEndpoint(string symbol, TimeInterval interval, ApiClientA
             }
 
             var param = symbol + $"@kline_{interval.GetDescription()}";
-            _apiClient.ConnectToWebSocket(param, klineHandler);
+            return _apiClient.ConnectToWebSocket(param, klineHandler);
         }
 
         /// <summary>
@@ -596,7 +597,7 @@ public void ListenKlineEndpoint(string symbol, TimeInterval interval, ApiClientA
         /// </summary>
         /// <param name="symbol">Ticker symbol.</param>
         /// <param name="tradeHandler">Handler to be used when a message is received.</param>
-        public void ListenTradeEndpoint(string symbol, ApiClientAbstract.MessageHandler<AggregateTradeMessage> tradeHandler)
+        public WebSocket ListenTradeEndpoint(string symbol, ApiClientAbstract.MessageHandler<AggregateTradeMessage> tradeHandler)
         {
             if (string.IsNullOrWhiteSpace(symbol))
             {
@@ -604,7 +605,7 @@ public void ListenTradeEndpoint(string symbol, ApiClientAbstract.MessageHandler<
             }
 
             var param = symbol + "@aggTrade";
-            _apiClient.ConnectToWebSocket(param, tradeHandler);
+            return _apiClient.ConnectToWebSocket(param, tradeHandler);
         }
 
         /// <summary>