diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index db55319ce..d1f3390cc 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -28,7 +28,6 @@ export default {
     'fallback',
     'options',
     'no-inherit',
-    'isLocal',
   ],
   mounted() {
     useInterfaceStore().queryLocalFonts()
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 06bd07edf..26833b9de 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -8,7 +8,7 @@
         :model-value="present"
         @change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
       >
-        <LocalSettingIndicator :is-local="isLocal" />
+        <LocalSettingIndicator />
         {{ ' ' }}
         <i18n-t
           scope="global"
diff --git a/src/components/settings_modal/tabs/clutter_tab.vue b/src/components/settings_modal/tabs/clutter_tab.vue
index fe75582ed..8ae416ff8 100644
--- a/src/components/settings_modal/tabs/clutter_tab.vue
+++ b/src/components/settings_modal/tabs/clutter_tab.vue
@@ -62,12 +62,18 @@
           </IntegerSetting>
         </li>
         <li>
-          <BooleanSetting path="hideAttachments">
+          <BooleanSetting
+            :local="true"
+            path="hideAttachments"
+          >
             {{ $t('settings.hide_attachments_in_tl') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting path="hideAttachmentsInConv">
+          <BooleanSetting
+            :local="true"
+            path="hideAttachmentsInConv"
+          >
             {{ $t('settings.hide_attachments_in_convo') }}
           </BooleanSetting>
         </li>
diff --git a/src/components/settings_modal/tabs/composing_tab.vue b/src/components/settings_modal/tabs/composing_tab.vue
index afed59cbc..755539096 100644
--- a/src/components/settings_modal/tabs/composing_tab.vue
+++ b/src/components/settings_modal/tabs/composing_tab.vue
@@ -91,6 +91,7 @@
         <li>
           <BooleanSetting
             path="imageCompression"
+            :local="true"
             expert="1"
           >
             {{ $t('settings.image_compression') }}
@@ -99,6 +100,7 @@
             <li>
               <BooleanSetting
                 path="alwaysUseJpeg"
+                :local="true"
                 expert="1"
                 parent-path="imageCompression"
               >
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 905a2baec..a3cb5be07 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -68,7 +68,6 @@
             name="ui"
             :label="$t('settings.style.fonts.components_inline.interface')"
             :fallback="{ family: 'sans-serif' }"
-            :is-local="true"
             no-inherit="1"
             @update:model-value="v => updateFont('interface', v)"
           />
@@ -77,7 +76,6 @@
           <FontControl
             :model-value="theme3hacks.fonts.input"
             name="input"
-            :is-local="true"
             :fallback="{ family: 'inherit' }"
             :label="$t('settings.style.fonts.components_inline.input')"
             @update:model-value="v => updateFont('input', v)"
@@ -100,6 +98,7 @@
               <FloatSetting
                 v-if="user"
                 path="emojiReactionsScale"
+                :local="true"
               >
                 {{ $t('settings.emoji_reactions_scale') }}
               </FloatSetting>
diff --git a/src/components/settings_modal/tabs/layout_tab.vue b/src/components/settings_modal/tabs/layout_tab.vue
index acae859a0..ca514e0cb 100644
--- a/src/components/settings_modal/tabs/layout_tab.vue
+++ b/src/components/settings_modal/tabs/layout_tab.vue
@@ -40,6 +40,7 @@
         <li>
           <UnitSetting
             path="themeEditorMinWidth"
+            :local="true"
             :units="['px', 'rem']"
             expert="1"
           >
@@ -83,12 +84,18 @@
           </UnitSetting>
         </li>
         <li>
-          <BooleanSetting path="sidebarRight">
+          <BooleanSetting
+            :local="true"
+            path="sidebarRight"
+          >
             {{ $t('settings.right_sidebar') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting path="navbarColumnStretch">
+          <BooleanSetting
+            :local="true"
+            path="navbarColumnStretch"
+          >
             {{ $t('settings.navbar_column_stretch') }}
           </BooleanSetting>
         </li>
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index dafeb15ca..fbfaf08a3 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -94,8 +94,6 @@ export const instanceDefaultConfig = {
   webPushAlwaysShowNotifications: false,
   interfaceLanguage: browserLocale,
   hideScopeNotice: false,
-  useStreamingApi: false,
-  sidebarRight: false,
   scopeCopy: true,
   subjectLineBehavior: 'email',
   alwaysShowSubjectInput: true,
@@ -168,6 +166,7 @@ export const defaultConfigLocal = {
   hideAttachments: false,
   hideAttachmentsInConv: false,
   postContentType: 'text/plain',
+  sidebarRight: false,
   sidebarColumnWidth: '25rem',
   contentColumnWidth: '45rem',
   notifsColumnWidth: '25rem',
@@ -181,6 +180,7 @@ export const defaultConfigLocal = {
   mentionLinkDisplay: 'short',
   alwaysUseJpeg: false,
   imageCompression: true,
+  useStreamingApi: false,
 }
 
 export const makeUndefined = (c) =>