diff --git a/website/src/lib/components/LanguageSelect.svelte b/website/src/lib/components/LanguageSelect.svelte
index 891704b7..16b6b9db 100644
--- a/website/src/lib/components/LanguageSelect.svelte
+++ b/website/src/lib/components/LanguageSelect.svelte
@@ -26,16 +26,22 @@
 	</Select.Trigger>
 	<Select.Content>
 		{#each Object.entries(languages) as [lang, label]}
-			<a href={getURLForLanguage(lang)}>
-				<Select.Item value={lang}>{label}</Select.Item>
-			</a>
+			{#if $page.url.pathname.includes('404')}
+				<a href={getURLForLanguage(lang, '/')}>
+					<Select.Item value={lang}>{label}</Select.Item>
+				</a>
+			{:else}
+				<a href={getURLForLanguage(lang, $page.url.pathname)}>
+					<Select.Item value={lang}>{label}</Select.Item>
+				</a>
+			{/if}
 		{/each}
 	</Select.Content>
 </Select.Root>
 
 <!-- hidden links for svelte crawling -->
 <div class="hidden">
-	{#if $page.url.pathname !== '/404'}
+	{#if !$page.url.pathname.includes('404')}
 		{#each Object.entries(languages) as [lang, label]}
 			<a href={getURLForLanguage(lang, $page.url.pathname)}>
 				{label}
diff --git a/website/src/lib/components/Menu.svelte b/website/src/lib/components/Menu.svelte
index 5b7470af..5ca99121 100644
--- a/website/src/lib/components/Menu.svelte
+++ b/website/src/lib/components/Menu.svelte
@@ -367,7 +367,7 @@
 						<Menubar.SubContent>
 							<Menubar.RadioGroup bind:value={$locale}>
 								{#each Object.entries(languages) as [lang, label]}
-									<a href={getURLForLanguage(lang)}>
+									<a href={getURLForLanguage(lang, '/app')}>
 										<Menubar.RadioItem value={lang}>{label}</Menubar.RadioItem>
 									</a>
 								{/each}
diff --git a/website/src/lib/utils.ts b/website/src/lib/utils.ts
index 2306708e..3542aae4 100644
--- a/website/src/lib/utils.ts
+++ b/website/src/lib/utils.ts
@@ -122,8 +122,8 @@ export function setScissorsCursor() {
     setCursor(scissorsCursor);
 }
 
-export function getURLForLanguage(lang: string | null | undefined, path?: string): string {
-    let newPath = path ?? (browser ? window.location.pathname.replace(base, '') : '');
+export function getURLForLanguage(lang: string | null | undefined, path: string): string {
+    let newPath = path.replace(base, '');
     let languageInPath = newPath.split('/')[1];
     if (!languages.hasOwnProperty(languageInPath)) {
         languageInPath = 'en';