@@ -119,6 +119,12 @@ void RegistryTracker::runRegistry()
119119 QString registry_ini = QString(REGISTRY_CONFIG).arg(m_mw_config.fileName()).arg(scopeInstallDir).arg(scopeRunnerBin);
120120 QString mw_ini = QString(MW_CONFIG).arg(m_endpoints_dir.path());
121121
122+ if (!m_systemScopes) {
123+ // Disable OEM and Click scopes when system scopes are disabled
124+ registry_ini += "OEM.InstallDir =\n";
125+ registry_ini += "Click.InstallDir =\n";
126+ }
127+
122128 m_runtime_config.write(runtime_ini.toUtf8());
123129 m_registry_config.write(registry_ini.toUtf8());
124130 m_mw_config.write(mw_ini.toUtf8());