diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 891baa113..552c3fed4 100644
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -112,6 +112,9 @@ void DbConnection::Pause()
 
 	NewTransaction();
 
+	/* Work on remaining tasks but never delete the threads, for HA resuming later. */
+	m_QueryQueue.Join();
+
 	ConfigObject::Pause();
 }
 
diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 65fce5fd7..5b0a39326 100644
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -107,9 +107,6 @@ void IdoMysqlConnection::Pause()
 
 	m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow);
 
-	/* Work on remaining tasks but never delete the threads, for HA resuming later. */
-	m_QueryQueue.Join();
-
 	Log(LogInformation, "IdoMysqlConnection")
 		<< "'" << GetName() << "' paused.";
 
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index cb0994cdc..eba81f64f 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -106,9 +106,6 @@ void IdoPgsqlConnection::Pause()
 
 	m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow);
 
-	/* Work on remaining tasks but never delete the threads, for HA resuming later. */
-	m_QueryQueue.Join();
-
 	Log(LogInformation, "IdoPgsqlConnection")
 		<< "'" << GetName() << "' paused.";
 }