diff --git a/include/mqtt/endpoint.hpp b/include/mqtt/endpoint.hpp
index 7488c4bf..dcadd5e5 100644
--- a/include/mqtt/endpoint.hpp
+++ b/include/mqtt/endpoint.hpp
@@ -1100,7 +1100,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
             << MQTT_ADD_VALUE(address, this)
             << "force_disconnect";
 
-        sync_shutdown(socket());
+        sync_force_shutdown(socket());
     }
 
     /**
@@ -5326,6 +5326,31 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
         connected_ = false;
     }
 
+    void sync_force_shutdown(MQTT_NS::socket& s) {
+        MQTT_LOG("mqtt_impl", trace)
+            << MQTT_ADD_VALUE(address, this)
+            << "sync_force_shutdown";
+        if (shutdown_requested_) {
+            MQTT_LOG("mqtt_impl", trace)
+                << MQTT_ADD_VALUE(address, this)
+                << "already shutdowned";
+            return;
+        }
+        shutdown_requested_ = true;
+        mqtt_connected_ = false;
+
+        error_code ec;
+        MQTT_LOG("mqtt_impl", trace)
+            << MQTT_ADD_VALUE(address, this)
+            << "force_shutdown_and_close";
+        s.force_shutdown_and_close(ec);
+        MQTT_LOG("mqtt_impl", trace)
+            << MQTT_ADD_VALUE(address, this)
+            << "force_shutdown_and_close ec:"
+            << ec.message();
+        connected_ = false;
+    }
+
     void async_shutdown(MQTT_NS::socket& s, async_handler_t func) {
         MQTT_LOG("mqtt_impl", trace)
             << MQTT_ADD_VALUE(address, this)