diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 8c672bd20..7d0113d35 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -108,7 +108,7 @@ const MentionLink = {
       return this.highlightData && '-' + this.highlightData.type
     },
     highlightClass() {
-       return this.highlightData && highlightClass(this.user)
+      return this.highlightData && highlightClass(this.user)
     },
     style() {
       if (this.highlightData) {
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index a99067f36..ea1b56212 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -9,12 +9,10 @@ import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 import Popover from '../popover/popover.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
-import {
-  LOCAL_ONLY_KEYS,
-  useLocalConfigStore,
-} from 'src/stores/local_config.js'
+import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
+import { LOCAL_ONLY_KEYS } from 'src/modules/default_config_state.js'
 import {
   newExporter,
   newImporter,
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 691563e88..c447595ff 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -36,7 +36,7 @@ const FilteringTab = {
         label: this.$t(`user_card.mute_block_${mode}`),
       })),
       muteFiltersDraftObject: cloneDeep(
-        useSyncConfigStore().prefsStorage.simple.muteFilters,
+        useSyncConfigStore().mergedConfig.muteFilters,
       ),
       muteFiltersDraftDirty: Object.fromEntries(
         Object.entries(
@@ -260,7 +260,7 @@ const FilteringTab = {
     },
     muteFiltersObject() {
       this.muteFiltersDraftObject = cloneDeep(
-        useSyncConfigStore().prefsStorage.simple.muteFilters,
+        useSyncConfigStore().mergedConfig.muteFilters,
       )
     },
   },
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index a391e9b21..7823777a9 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -182,6 +182,7 @@ export const defaultConfigLocal = {
   imageCompression: true,
   useStreamingApi: false,
 }
+export const LOCAL_ONLY_KEYS = new Set(Object.keys(defaultConfigLocal))
 
 export const makeUndefined = (c) =>
   Object.fromEntries(Object.keys(c).map((key) => [key, undefined]))
diff --git a/src/stores/local_config.js b/src/stores/local_config.js
index 3611b559e..73ea1d7d4 100644
--- a/src/stores/local_config.js
+++ b/src/stores/local_config.js
@@ -6,8 +6,6 @@ import { useInstanceStore } from 'src/stores/instance'
 
 import { defaultState as configDefaultState } from 'src/modules/default_config_state'
 
-export const LOCAL_ONLY_KEYS = new Set(Object.keys(configDefaultState))
-
 export const defaultState = {
   prefsStorage: {
     ...configDefaultState,
diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js
index 7d91dfe84..8b6bc0913 100644
--- a/src/stores/sync_config.js
+++ b/src/stores/sync_config.js
@@ -1,7 +1,9 @@
+import sum from 'hash-sum'
 import {
   merge as _merge,
   clamp,
   cloneDeep,
+  debounce,
   findLastIndex,
   flatten,
   get,
@@ -11,25 +13,21 @@ import {
   takeRight,
   uniqWith,
   unset,
-  debounce,
 } from 'lodash'
 import { defineStore } from 'pinia'
 import { toRaw } from 'vue'
-import sum from 'hash-sum'
 
 import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
-import {
-  LOCAL_ONLY_KEYS,
-  useLocalConfigStore,
-} from 'src/stores/local_config.js'
+import { useLocalConfigStore } from 'src/stores/local_config.js'
 
 import { storage } from 'src/lib/storage.js'
 import {
   defaultState as configDefaultState,
   defaultConfigLocal,
   instanceDefaultConfig,
+  LOCAL_ONLY_KEYS,
 } from 'src/modules/default_config_state.js'
 import { defaultConfigSync } from 'src/modules/old_default_config_state.js'