diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 7f9e2c7cd..94c89526c 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -1070,6 +1070,10 @@ int BrowserService::moveKeysToCustomData(Entry* entry, const QSharedPointer<Data
 
 bool BrowserService::checkLegacySettings()
 {
+    if (!browserSettings()->isEnabled()) {
+        return false;
+    }
+
     auto db = getDatabase();
     if (!db) {
         return false;