diff --git a/src/core/atomicdex/services/kdf/kdf.service.cpp b/src/core/atomicdex/services/kdf/kdf.service.cpp
index 741a21fdea..6c7e654afb 100644
--- a/src/core/atomicdex/services/kdf/kdf.service.cpp
+++ b/src/core/atomicdex/services/kdf/kdf.service.cpp
@@ -2227,6 +2227,17 @@ namespace atomic_dex
             .passphrase = std::move(passphrase), 
             .rpc_password = std::move(rpcpass) == "" ? std::move(atomic_dex::gen_random_password()) : std::move(rpcpass)
         };
+
+        auto dbdir = std::filesystem::path(cfg.dbdir);
+        auto old_dbdir = std::filesystem::path(utils::get_atomic_dex_data_folder() / "mm2" / "DB");
+        if (not std::filesystem::exists(dbdir))
+        {
+            if (std::filesystem::exists(old_dbdir))
+            {
+                std::filesystem::rename(old_dbdir, dbdir);
+            }
+        }
+
         kdf::set_system_manager(m_system_manager);
         kdf::set_rpc_password(cfg.rpc_password);
         json       json_cfg;