diff --git a/src/mqttclient.cpp b/src/mqttclient.cpp
index 2f7aef9..333c4d4 100644
--- a/src/mqttclient.cpp
+++ b/src/mqttclient.cpp
@@ -73,6 +73,12 @@ MqttClient::MqttClient(const std::string& _clientId, const std::function<void(co
 
 MqttClient::~MqttClient()
 {
+    LogDebug( "MqttClient", std::string( m_clientId + " - dtor stop queue" ) );
+    m_eventQueue.stop();
+    if (m_workerThread.joinable()) {
+        m_workerThread.join();
+    }
+    
     {
         // LogDebug( "MqttClient", std::string( m_clientId + " - disconnect" ) );
         this->disconnect();
@@ -83,11 +89,6 @@ MqttClient::~MqttClient()
         m_principalClient.swap(principalClient);
     }
 
-    LogDebug( "MqttClient", std::string( m_clientId + " - dtor stop queue" ) );
-    m_eventQueue.stop();
-    if (m_workerThread.joinable()) {
-        m_workerThread.join();
-    }
     LogDebug( "MqttClient", std::string( m_clientId + " - dtor ready" ) );
 }
 
diff --git a/test/SledgeHammerTest.cpp b/test/SledgeHammerTest.cpp
index 6ad4194..7f31e7f 100644
--- a/test/SledgeHammerTest.cpp
+++ b/test/SledgeHammerTest.cpp
@@ -123,8 +123,8 @@ TEST(SledgeHammerTest, MultipleConnections_BurnTest)
     std::unordered_map<std::string, Publisher *> publishers;
 
     const int max_run = 100;
-    const int max_connections = 10;
-    const int max_messages = 10;
+    const int max_connections = 5;
+    const int max_messages = 100;
 
     for (int test_run = 0; test_run < max_run; test_run++)
     {