diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f0c58e4..92ef6f39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 121:
 
 * Add test for issue 802
+* Fix enum and non-enum in conditional exp. warning
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/websocket/impl/read.ipp b/include/boost/beast/websocket/impl/read.ipp
index 8663a9d2..c643e32a 100644
--- a/include/boost/beast/websocket/impl/read.ipp
+++ b/include/boost/beast/websocket/impl/read.ipp
@@ -1075,7 +1075,8 @@ loop:
                 // _Start the WebSocket Closing Handshake_
                 do_fail(
                     cr.code == close_code::none ?
-                        close_code::normal : cr.code,
+                        close_code::normal : 
+                        static_cast<close_code>(cr.code),
                     error::closed, ec);
                 return bytes_written;
             }