diff --git a/src/components/settings/AppGeneralSettings.tsx b/src/components/settings/AppGeneralSettings.tsx
index 31e9ad14..875521c3 100644
--- a/src/components/settings/AppGeneralSettings.tsx
+++ b/src/components/settings/AppGeneralSettings.tsx
@@ -45,7 +45,7 @@ export default (props: Props) => {
               <SettingsUIComponent
                 settings={item}
                 editing={() => true}
-                value={() => props.settingsValue()[item.key as keyof GeneralSettings] || false}
+                value={() => props.settingsValue()[item.key as keyof GeneralSettings] || item.default || ''}
                 setValue={(v) => {
                   props.updateSettings({ [item.key]: v })
                 }}
diff --git a/src/components/settings/ProviderGlobalSettings.tsx b/src/components/settings/ProviderGlobalSettings.tsx
index 98335ad7..aa4869e7 100644
--- a/src/components/settings/ProviderGlobalSettings.tsx
+++ b/src/components/settings/ProviderGlobalSettings.tsx
@@ -69,7 +69,7 @@ export default ({ config, settingsValue, setSettings }: Props) => {
               <SettingsUIComponent
                 settings={item}
                 editing={editing}
-                value={() => formData()[item.key] || ''}
+                value={() => formData()[item.key]}
                 setValue={(v) => {
                   setEditFormData({ ...formData(), [item.key]: v })
                 }}
diff --git a/src/hooks/useI18n.ts b/src/hooks/useI18n.ts
index b3b9d551..5d1e435c 100644
--- a/src/hooks/useI18n.ts
+++ b/src/hooks/useI18n.ts
@@ -33,7 +33,7 @@ export function useI18n() {
   providerSettingsMap.listen((value, changedKey) => {
     const general = value[changedKey] as unknown as GeneralSettings
     defaultLocale = general?.locale
-    setCurrentLocale(locales[defaultLocale as string])
+    defaultLocale && setCurrentLocale(locales[defaultLocale as string])
   })
 
   setCurrentLocale(locales[defaultLocale as string])