diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp
index 97b973366e..99a4423697 100644
--- a/websocketpp/impl/connection_impl.hpp
+++ b/websocketpp/impl/connection_impl.hpp
@@ -1712,6 +1712,8 @@ lib::error_code connection<config>::send_close_frame(close::status::value code,
         msg->set_terminal(true);
     }
     
+    m_state = session::state::closing;
+    
     bool needs_writing = false;
     {
         scoped_lock_type lock(m_write_lock);