diff --git a/packages/website/src/components/LocaleRedirector.astro b/packages/website/src/components/LocaleRedirector.astro
index e4ed25333..80c0afeaa 100644
--- a/packages/website/src/components/LocaleRedirector.astro
+++ b/packages/website/src/components/LocaleRedirector.astro
@@ -1,3 +1,30 @@
 <script>
+  import locales from "@blitzkit/i18n/locales.json";
+  import { getBestLocale } from "../core/i18n/getBestLocale";
 
+  const pathname = window.location.pathname;
+  const isAPI = pathname.startsWith("/api");
+  const hasPreference = localStorage.getItem("preferred-locale") !== null;
+  const bestLocale = getBestLocale();
+  const currentLocale =
+    locales.supported.find(
+      ({ locale }) =>
+        locale !== locales.default &&
+        (pathname === `/${locale}` || pathname.startsWith(`/${locale}/`)),
+    )?.locale ?? locales.default;
+
+  if (
+    !isAPI &&
+    bestLocale !== currentLocale &&
+    (hasPreference || currentLocale === locales.default)
+  ) {
+    const rawPath =
+      currentLocale === locales.default
+        ? pathname
+        : pathname.slice(`/${currentLocale}`.length) || "/";
+
+    window.location.pathname = `${
+      bestLocale === locales.default ? "" : `/${bestLocale}`
+    }${rawPath}`;
+  }
 </script>