diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index 5b3081c5a2dbd..ad336565fbcd0 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -157,6 +157,8 @@ int main(int argc, char** argv)
     if (!StartDB())
         return 1;
 
+    std::shared_ptr<void> dbHandle(nullptr, [](void*) { StopDB(); });
+
     if (vm.count("update-databases-only"))
         return 0;
 
@@ -167,8 +169,6 @@ int main(int argc, char** argv)
     // Load IP Location Database
     sIPLocation->Load();
 
-    std::shared_ptr<void> dbHandle(nullptr, [](void*) { StopDB(); });
-
     std::shared_ptr<Trinity::Asio::IoContext> ioContext = std::make_shared<Trinity::Asio::IoContext>();
 
     // Start the listening port (acceptor) for auth connections
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 5c596e5c99db6..e53d2741b18d0 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -264,11 +264,11 @@ extern int main(int argc, char** argv)
     if (!StartDB())
         return 1;
 
+    std::shared_ptr<void> dbHandle(nullptr, [](void*) { StopDB(); });
+
     if (vm.count("update-databases-only"))
         return 0;
 
-    std::shared_ptr<void> dbHandle(nullptr, [](void*) { StopDB(); });
-
     // Set server offline (not connectable)
     LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag | %u WHERE id = '%d'", REALM_FLAG_OFFLINE, realm.Id.Realm);