diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index d25a9ed6df1..ad9d3517fb8 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -538,7 +538,7 @@ bool SettingsAccessor::isValidVersionAndId(const int version, const QByteArray &
     const int lastVersion = currentVersion();
 
     return (version >= firstVersion && version <= lastVersion)
-            && ( id == requiredId || requiredId.isEmpty());
+            && (id.isEmpty() || requiredId.isEmpty() || id == requiredId);
 }
 
 /*!