diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Version 1.7.1
+
+* NOP on UserCanceled event
+  [#454](https://github.com/haskell-tls/hs-tls/pull/454)
+
 ## Version 1.7.0
 
 * Major version up because "crypton" is used instead of "cryptonite"
diff --git a/Network/TLS/Core.hs b/Network/TLS/Core.hs
--- a/Network/TLS/Core.hs
+++ b/Network/TLS/Core.hs
@@ -147,7 +147,8 @@
 recvData13 ctx = do
     pkt <- recvPacket13 ctx
     either (onError terminate) process pkt
-  where process (Alert13 [(AlertLevel_Warning, CloseNotify)]) = tryBye ctx >> setEOF ctx >> return B.empty
+  where process (Alert13 [(AlertLevel_Warning, UserCanceled)]) = return B.empty
+        process (Alert13 [(AlertLevel_Warning, CloseNotify)]) = tryBye ctx >> setEOF ctx >> return B.empty
         process (Alert13 [(AlertLevel_Fatal, desc)]) = do
             setEOF ctx
             E.throwIO (Terminated True ("received fatal error: " ++ show desc) (Error_Protocol ("remote side fatal error", True, desc)))
diff --git a/Network/TLS/Extra/Cipher.hs b/Network/TLS/Extra/Cipher.hs
--- a/Network/TLS/Extra/Cipher.hs
+++ b/Network/TLS/Extra/Cipher.hs
@@ -242,7 +242,7 @@
     | SetOther [Cipher]
 
 -- Preference between AEAD ciphers having equivalent properties is based on
--- hardware-acceleration support in the cryptonite implementation.
+-- hardware-acceleration support in the crypton implementation.
 sortOptimized :: [CipherSet] -> [Cipher]
 sortOptimized = concatMap f
   where
diff --git a/tls.cabal b/tls.cabal
--- a/tls.cabal
+++ b/tls.cabal
@@ -1,6 +1,6 @@
 cabal-version:      >=1.10
 name:               tls
-version:            1.7.0
+version:            1.7.1
 license:            BSD3
 license-file:       LICENSE
 copyright:          Vincent Hanquez <vincent@snarc.org>