diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95f34d89..c74c83c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,14 @@
 1.0.0-b33
 
 * Require Visual Studio 2015 Update 3 or later
+
+HTTP
+
 * Use fwrite return value in file_body
+
+WebSocket
+
+* Set internal state correctly when writing frames
 * Add decorator unit test
 * Add write_frames unit test
 
diff --git a/include/beast/websocket/impl/write.ipp b/include/beast/websocket/impl/write.ipp
index 4b010678..37339947 100644
--- a/include/beast/websocket/impl/write.ipp
+++ b/include/beast/websocket/impl/write.ipp
@@ -770,6 +770,7 @@ write_frame(bool fin,
             fh.len = n;
             remain -= n;
             fh.fin = fin ? remain == 0 : false;
+            wr_.cont = ! fh.fin;
             detail::fh_streambuf fh_buf;
             detail::write<static_streambuf>(fh_buf, fh);
             boost::asio::write(stream_,