diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 2c1ba5563..782a005e1 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -200,6 +200,7 @@ const SettingsModal = {
       let sample = config
       if (!theme) {
         const ignoreList = new Set([
+          'theme',
           'customTheme',
           'customThemeSource',
           'colors',
@@ -207,7 +208,9 @@ const SettingsModal = {
           'styleCustomData',
           'palette',
           'paletteCustomData',
+          'themeChecksum',
         ])
+
         sample = Object.fromEntries(
           Object.entries(sample).filter(
             ([key, value]) => !ignoreList.has(key) && value !== undefined,
diff --git a/src/stores/merged_config.js b/src/stores/merged_config.js
index c4f27082c..3e218c942 100644
--- a/src/stores/merged_config.js
+++ b/src/stores/merged_config.js
@@ -50,16 +50,15 @@ export const useMergedConfigStore = defineStore('merged_config', {
       return result
     },
     mergedConfigWithoutDefaults: () => {
-      const instancePrefs = useInstanceStore().prefsStorage
       const tempPrefs = useLocalConfigStore().tempStorage
       const localPrefs = useLocalConfigStore().prefsStorage
       const syncPrefs = useSyncConfigStore().prefsStorage
 
       const getValue = (k) =>
-        tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k] ?? instancePrefs[k]
+        tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k]
 
       const result = Object.fromEntries(
-        Object.keys(ROOT_CONFIG).map(([k, value]) => [k, getValue(k)]),
+        Object.keys(ROOT_CONFIG).map((k) => [k, getValue(k)]),
       )
       return result
     },