diff --git a/app/src/components/ServerTab/LanguageSelect.tsx b/app/src/components/ServerTab/LanguageSelect.tsx
index c47410b5..8959204f 100644
--- a/app/src/components/ServerTab/LanguageSelect.tsx
+++ b/app/src/components/ServerTab/LanguageSelect.tsx
@@ -10,10 +10,15 @@ import { SUPPORTED_LANGUAGES } from '@/i18n';
 
 export function LanguageSelect() {
   const { i18n } = useTranslation();
-  const current = SUPPORTED_LANGUAGES.find((l) => l.code === i18n.resolvedLanguage)?.code ?? 'en';
+  const current = SUPPORTED_LANGUAGES.find((l) => l.code === i18n.language)?.code ?? 'en';
 
   return (
-    <Select value={current} onValueChange={(value) => i18n.changeLanguage(value)}>
+    <Select
+      value={current}
+      onValueChange={(value) => {
+        void i18n.changeLanguage(value);
+      }}
+    >
       <SelectTrigger className="h-9 w-[180px]">
         <SelectValue />
       </SelectTrigger>
diff --git a/app/src/i18n/index.ts b/app/src/i18n/index.ts
index 3a987bbb..0054ea62 100644
--- a/app/src/i18n/index.ts
+++ b/app/src/i18n/index.ts
@@ -21,8 +21,9 @@ i18n
     },
     fallbackLng: 'en',
     supportedLngs: SUPPORTED_LANGUAGES.map((l) => l.code),
-    nonExplicitSupportedLngs: true,
+    load: 'currentOnly',
     interpolation: { escapeValue: false },
+    react: { useSuspense: false },
     detection: {
       order: ['localStorage', 'navigator'],
       lookupLocalStorage: 'voicebox:lang',