diff --git a/CryptoExchange.Net/CryptoExchange.Net.xml b/CryptoExchange.Net/CryptoExchange.Net.xml
index f9a1a0f..de29b82 100644
--- a/CryptoExchange.Net/CryptoExchange.Net.xml
+++ b/CryptoExchange.Net/CryptoExchange.Net.xml
@@ -3818,7 +3818,9 @@
         <member name="M:CryptoExchange.Net.Sockets.WebsocketFactory.CreateWebsocket(CryptoExchange.Net.Logging.Log,System.String,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String})">
             <inheritdoc />
         </member>
-        <member name="T:System.Diagnostics.CodeAnalysis.AllowNullAttribute">
+    </members>
+</doc>
+System.Diagnostics.CodeAnalysis.AllowNullAttribute">
             <summary>
                 Specifies that <see langword="null"/> is allowed as an input even if the
                 corresponding type disallows it.
diff --git a/CryptoExchange.Net/RestClient.cs b/CryptoExchange.Net/RestClient.cs
index 0e8e6fd..599a7a7 100644
--- a/CryptoExchange.Net/RestClient.cs
+++ b/CryptoExchange.Net/RestClient.cs
@@ -284,7 +284,7 @@ namespace CryptoExchange.Net
                 log.Write(LogLevel.Warning, $"[{request.RequestId}] Request exception: " + exceptionInfo);
                 return new WebCallResult<T>(null, null, default, new WebError(exceptionInfo));
             }
-            catch (TaskCanceledException canceledException)
+            catch (OperationCanceledException canceledException)
             {
                 if (canceledException.CancellationToken == cancellationToken)
                 {
diff --git a/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs b/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs
index f57abae..2a4ce21 100644
--- a/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs
+++ b/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs
@@ -339,7 +339,7 @@ namespace CryptoExchange.Net.Sockets
                 {
                     await _socket.SendAsync(new ArraySegment<byte>(data, 0, data.Length), WebSocketMessageType.Text, true, _ctsSource.Token).ConfigureAwait(false);
                 }
-                catch (TaskCanceledException)
+                catch (OperationCanceledException)
                 {
                     // cancelled
                     break;
@@ -377,9 +377,9 @@ namespace CryptoExchange.Net.Sockets
                         receiveResult = await _socket.ReceiveAsync(buffer, _ctsSource.Token).ConfigureAwait(false);
                         received += receiveResult.Count;
                     }
-                    catch (TaskCanceledException)
+                    catch (OperationCanceledException)
                     {
-                        // Cancelled
+                        // cancelled
                         break;
                     }
                     catch (WebSocketException wse)
@@ -513,10 +513,10 @@ namespace CryptoExchange.Net.Sockets
                 {
                     await Task.Delay(500, _ctsSource.Token).ConfigureAwait(false);
                 }
-                catch(TaskCanceledException)
+                catch (OperationCanceledException)
                 {
                     // cancelled
-                    return;
+                    break;
                 }
             }
         }