diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63c260b7..0324ef55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ Version 71:
 * Fix extra ; warning
 * Documentation revision
 
+WebSockets:
+
+* Fine tune websocket op asserts
+
 --------------------------------------------------------------------------------
 
 Version 70:
diff --git a/include/beast/websocket/impl/ping.ipp b/include/beast/websocket/impl/ping.ipp
index 4a0193a1..8b4f3d11 100644
--- a/include/beast/websocket/impl/ping.ipp
+++ b/include/beast/websocket/impl/ping.ipp
@@ -192,8 +192,8 @@ operator()(error_code ec, bool again)
         }
     }
 upcall:
-    if(d.ws.wr_block_ == &d)
-        d.ws.wr_block_ = nullptr;
+    BOOST_ASSERT(d.ws.wr_block_ == &d);
+    d.ws.wr_block_ = nullptr;
     d.ws.rd_op_.maybe_invoke() ||
         d.ws.wr_op_.maybe_invoke();
     d_.invoke(ec);