diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
index 7b765e2..97c8b57 100644
--- a/include/nbd_proxy.hpp
+++ b/include/nbd_proxy.hpp
@@ -413,9 +413,9 @@
                     BMCWEB_LOG_DEBUG << "No session to close";
                     return;
                 }
+                session->second->close();
                 // Remove reference to session in global map
                 sessions.erase(session);
-                session->second->close();
             })
         .onmessage([](crow::websocket::Connection& conn,
                       const std::string& data, bool) {