diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3162979..993b6342 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Version XXX:
 
+* Add handler tracking locations to tcp teardown.
 * Eliminate spurious uninitialised variable warning in detect_ssl.
 * Add handler tracking locations to flat_stream.
 * Add handler tracking locations to detect_ssl.
diff --git a/include/boost/beast/websocket/impl/teardown.hpp b/include/boost/beast/websocket/impl/teardown.hpp
index b40790af..3dfc3d2f 100644
--- a/include/boost/beast/websocket/impl/teardown.hpp
+++ b/include/boost/beast/websocket/impl/teardown.hpp
@@ -89,7 +89,7 @@ public:
                     {
                         BOOST_ASIO_HANDLER_LOCATION((
                             __FILE__, __LINE__,
-                            "websocket::ssl::teardown"
+                            "websocket::tcp::async_teardown"
                         ));
 
                         s_.async_wait(
@@ -121,8 +121,15 @@ public:
             if(! cont)
             {
                 BOOST_ASIO_CORO_YIELD
-                net::post(bind_front_handler(
-                    std::move(*this), ec));
+                {
+                    BOOST_ASIO_HANDLER_LOCATION((
+                        __FILE__, __LINE__,
+                        "websocket::tcp::async_teardown"
+                        ));
+
+                    net::post(bind_front_handler(
+                        std::move(*this), ec));
+                }
             }
             {
                 error_code ignored;