diff --git a/website/src/lib/components/docs/DocsLoader.svelte b/website/src/lib/components/docs/DocsLoader.svelte
index 65b13c8e..cd4a4e02 100644
--- a/website/src/lib/components/docs/DocsLoader.svelte
+++ b/website/src/lib/components/docs/DocsLoader.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
 	import { goto } from '$app/navigation';
+	import { base } from '$app/paths';
 	import { _, locale } from 'svelte-i18n';
 
 	export let path: string;
@@ -22,7 +23,7 @@
 		if (modules.hasOwnProperty(`/src/lib/docs/${$locale}/${path}`)) {
 			loadModule(`/src/lib/docs/${$locale}/${path}`);
 		} else if (browser) {
-			goto(`/404`);
+			goto(`${base}/404`);
 		}
 	}
 </script>
diff --git a/website/src/routes/+layout.svelte b/website/src/routes/+layout.svelte
index 5c257c9c..bddcd61a 100644
--- a/website/src/routes/+layout.svelte
+++ b/website/src/routes/+layout.svelte
@@ -9,6 +9,7 @@
 	import { languages } from '$lib/languages';
 	import { browser } from '$app/environment';
 	import { goto } from '$app/navigation';
+	import { base } from '$app/paths';
 
 	$: if ($page.params.language === '' && $locale !== 'en') {
 		locale.set('en');
@@ -18,7 +19,7 @@
 			if (languages.hasOwnProperty(lang)) {
 				locale.set(lang);
 			} else if (browser) {
-				goto('/404');
+				goto(`${base}/404`);
 			}
 		}
 	}