diff --git a/oidc-ui/src/components/NavHeader.js b/oidc-ui/src/components/NavHeader.js
index 7545d303e..c6ae6915a 100644
--- a/oidc-ui/src/components/NavHeader.js
+++ b/oidc-ui/src/components/NavHeader.js
@@ -25,7 +25,16 @@ export default function NavHeader({ langOptions, i18nKeyPrefix = "header" }) {
     let lang = langOptions.find((option) => {
       return option.value === i18n.language;
     });
-    setSelectedLang(lang);
+
+    if (lang == null) {
+      const defaultLanguageCode = window["envConfigs"].defaultLang;
+
+      // Find the language option that matches the extracted language code
+      const defaultLang = langOptions.find((option) => option.value === defaultLanguageCode);
+      setSelectedLang(defaultLang);
+    } else {
+      setSelectedLang(lang);
+    }
 
     //Gets fired when changeLanguage got called.
     i18n.on("languageChanged", function (lng) {