diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 3e03b63488d9d..88e24006e5fc9 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -244,7 +244,7 @@ bool AccountManager::restoreFromLegacySettings()
                 const auto cleanOverrideUrl = overrideUrl.endsWith('/') ? overrideUrl.chopped(1) : overrideUrl;
                 qCInfo(lcAccountManager) << "Migrate: overrideUrl" << cleanOverrideUrl;
 
-                if (!cleanOverrideUrl.isEmpty()) {
+                if (!cleanOverrideUrl.isEmpty() && !Theme::instance()->multipleOverrideServers()) {
                     oCSettings->beginGroup(QLatin1String(accountsC));
                     const auto accountsChildGroups = oCSettings->childGroups();
                     for (const auto &accountId : accountsChildGroups) {
@@ -252,6 +252,7 @@ bool AccountManager::restoreFromLegacySettings()
                         const auto oCUrl = oCSettings->value(QLatin1String(urlC)).toString();
                         const auto cleanOCUrl = oCUrl.endsWith('/') ? oCUrl.chopped(1) : oCUrl;
 
+
                         // in case the urls are equal reset the settings object to read from
                         // the ownCloud settings object
                         qCInfo(lcAccountManager) << "Migrate oC config if " << cleanOCUrl << " == " << cleanOverrideUrl << ":"