diff --git a/packages/desktop-client/src/components/settings/LanguageSettings.tsx b/packages/desktop-client/src/components/settings/LanguageSettings.tsx
index 8224b022e20..7c7f3199ba5 100644
--- a/packages/desktop-client/src/components/settings/LanguageSettings.tsx
+++ b/packages/desktop-client/src/components/settings/LanguageSettings.tsx
@@ -14,15 +14,12 @@ const languageOptions: SelectOption[] = [
   ['', 'System default'] as [string, string],
   Menu.line as typeof Menu.line,
 ].concat(
-  availableLanguages.map(
-    lang =>
-      [
-        lang,
-        new Intl.DisplayNames([lang], {
-          type: 'language',
-        }).of(lang),
-      ] as const,
-  ),
+  availableLanguages.map(lang => [
+    lang,
+    new Intl.DisplayNames([lang], {
+      type: 'language',
+    }).of(lang) || lang,
+  ]),
 );
 
 export function LanguageSettings() {
@@ -34,7 +31,7 @@ export function LanguageSettings() {
       primaryAction={
         <Select
           options={languageOptions}
-          value={isEnabled ? language : 'not-available'}
+          value={isEnabled ? (language ?? '') : 'not-available'}
           defaultLabel={
             isEnabled ? 'Select language' : 'No languages available'
           }