diff --git a/packages/nicolium/src/features/preferences/index.tsx b/packages/nicolium/src/features/preferences/index.tsx
index 299a3a104..e14e438e3 100644
--- a/packages/nicolium/src/features/preferences/index.tsx
+++ b/packages/nicolium/src/features/preferences/index.tsx
@@ -17,7 +17,7 @@ import { useFeatures } from '@/hooks/use-features';
 import { useFrontendConfig } from '@/hooks/use-frontend-config';
 import { useInstance } from '@/hooks/use-instance';
 import { PaletteListItem } from '@/pages/dashboard/theme-editor';
-import { useSettings } from '@/stores/settings';
+import { useDefaultSettings, useSettings } from '@/stores/settings';
 import sourceCode from '@/utils/code';
 import colors from '@/utils/colors';
 import { isStandalone } from '@/utils/state';
@@ -158,6 +158,7 @@ const Preferences = () => {
   const dispatch = useAppDispatch();
   const features = useFeatures();
   const settings = useSettings();
+  const defaultSettings = useDefaultSettings();
   const frontendConfig = useFrontendConfig();
   const instance = useInstance();
   const standalone = useAppSelector(isStandalone);
@@ -218,10 +219,8 @@ const Preferences = () => {
   };
 
   const onThemeReset = () => {
-    dispatch(
-      changeSetting(['themeMode'], frontendConfig.defaultSettings.themeMode, { save: false }),
-    );
-    dispatch(changeSetting(['theme'], frontendConfig.defaultSettings.theme, { showAlert: true }));
+    dispatch(changeSetting(['themeMode'], defaultSettings.themeMode, { save: false }));
+    dispatch(changeSetting(['theme'], defaultSettings.theme, { showAlert: true }));
   };
 
   const displayMediaOptions = React.useMemo(
diff --git a/packages/nicolium/src/features/ui/components/theme-selector.tsx b/packages/nicolium/src/features/ui/components/theme-selector.tsx
index 11788555d..20bd6d432 100644
--- a/packages/nicolium/src/features/ui/components/theme-selector.tsx
+++ b/packages/nicolium/src/features/ui/components/theme-selector.tsx
@@ -37,7 +37,7 @@ const ThemeSelector: React.FC<IThemeSelector> = ({ id, value, onChange }) => {
         <Icon src={themeIconSrc} className='size-4 text-gray-600 dark:text-gray-700' />
       </div>
 
-      <Select id={id} onChange={handleChange} defaultValue={value} className='!pl-10'>
+      <Select key={value} id={id} onChange={handleChange} defaultValue={value} className='!pl-10'>
         <option value='system'>
           <FormattedMessage id='theme_toggle.system' defaultMessage='System' />
         </option>
diff --git a/packages/nicolium/src/stores/settings.ts b/packages/nicolium/src/stores/settings.ts
index 31341b469..d47bf95d5 100644
--- a/packages/nicolium/src/stores/settings.ts
+++ b/packages/nicolium/src/stores/settings.ts
@@ -279,6 +279,7 @@ const useSettingsStore = create<State>()(
 );
 
 const useSettings = () => useSettingsStore((state) => state.settings);
+const useDefaultSettings = () => useSettingsStore((state) => state.defaultSettings);
 const useSettingsStoreActions = () => useSettingsStore((state) => state.actions);
 
-export { useSettingsStore, useSettings, useSettingsStoreActions };
+export { useSettingsStore, useSettings, useDefaultSettings, useSettingsStoreActions };