diff --git a/apps/website/src/components/Header.tsx b/apps/website/src/components/Header.tsx
index e4cd7cc3f..1d13d6b69 100644
--- a/apps/website/src/components/Header.tsx
+++ b/apps/website/src/components/Header.tsx
@@ -23,11 +23,14 @@ export function Header(props: {repoStargazersCount: number}) {
     const locale = useContext(LocaleContext);
     const [ mobileMenuShown, setMobileMenuShown ] = useState(false);
 
-    const HEADER_LINKS = useMemo<HeaderLink[]>(() => [
-        { url: "/get-started/", text: t("header.get-started") },
-        { url: "https://docs.triliumnotes.org/", text: t("header.documentation"), external: true },
-        { url: "/support-us/", text: t("header.support-us") }
-    ], [ locale ]);
+    const [ headerLinks, setHeaderLinks ] = useState<HeaderLink[]>([]);
+    useEffect(() => {
+        setHeaderLinks([
+            { url: "/get-started/", text: t("header.get-started") },
+            { url: "https://docs.triliumnotes.org/", text: t("header.documentation"), external: true },
+            { url: "/support-us/", text: t("header.support-us") }
+        ]);
+    }, [ locale ]);
 
 	return (
 		<header>
@@ -50,7 +53,7 @@ export function Header(props: {repoStargazersCount: number}) {
                 </div>
 
                 <nav className={`${mobileMenuShown ? "mobile-shown" : ""}`}>
-                    {HEADER_LINKS.map(link => (
+                    {headerLinks.map(link => (
                         <Link
                             href={link.external ? link.url : `/${locale}${link.url}`}
                             className={url === link.url ? "active" : ""}
diff --git a/apps/website/src/index.tsx b/apps/website/src/index.tsx
index 4354d2e51..f6949df40 100644
--- a/apps/website/src/index.tsx
+++ b/apps/website/src/index.tsx
@@ -52,14 +52,15 @@ export function LocaleProvider({ children }) {
         },
         returnEmptyString: false
     }).then(() => setLoaded(true))
-  }, []);
+}, []);
 
-  useEffect(() => {
+  useLayoutEffect(() => {
+    if (!loaded) return;
     changeLanguage(localeId);
     const correspondingLocale = LOCALES.find(l => l.id === localeId);
     document.documentElement.lang = localeId;
     document.documentElement.dir = correspondingLocale?.rtl ? "rtl" : "ltr";
-  }, [ localeId ]);
+  }, [ loaded, localeId ]);
 
   return (
     <LocaleContext.Provider value={localeId}>