diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92ef6f39..3a3fc62a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 122:
+
+* Add test for issue 807
+
+--------------------------------------------------------------------------------
+
 Version 121:
 
 * Add test for issue 802
diff --git a/test/beast/websocket/read.cpp b/test/beast/websocket/read.cpp
index a04a9cdd..33077a33 100644
--- a/test/beast/websocket/read.cpp
+++ b/test/beast/websocket/read.cpp
@@ -1029,6 +1029,21 @@ public:
         }
     }
 
+    void
+    testIssue807()
+    {
+        echo_server es{log};
+        boost::asio::io_service ios;
+        stream<test::stream> ws{ios};
+        ws.next_layer().connect(es.stream());
+        ws.handshake("localhost", "/");
+        ws.write(sbuf("Hello, world!"));
+        char buf[4];
+        boost::asio::mutable_buffers_1 cb{buf, 0};
+        auto const n = ws.read_some(cb);
+        BEAST_EXPECT(n == 0);
+    }
+
     void
     run() override
     {
@@ -1037,6 +1052,7 @@ public:
         testParseFrame();
         testContHook();
         testIssue802();
+        testIssue807();
     }
 };