2 files changed, 2 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index e050bf5cd..21f44d66a 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1925,6 +1925,7 @@ void Client::loadData()
 
 void Client::unloadData()
 {
+    DbManager::unloadDb();
     mCurrentServer.supportUrl.clear();
     settings.supportUrl.clear();
     if (settings.options.dataPath.empty())
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 3bd115bf0..02bfd06ce 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -126,6 +126,7 @@ void connectToServer(const ServerInfo &server)
             generalHandler != nullptr)
         {
             generalHandler->unload();
+            delete2(generalHandler);
         }
 
         switch (server.type)