diff --git a/packages/web/src/components/Footer.astro b/packages/web/src/components/Footer.astro
index 0c66d7e63f7..a7d626eba3e 100644
--- a/packages/web/src/components/Footer.astro
+++ b/packages/web/src/components/Footer.astro
@@ -63,6 +63,46 @@ const discord = config.social?.find((item) => item.icon === "discord")
   )
 }
 
+<script is:inline>
+  // Update oc_locale cookie when language is changed via the dropdown
+  // to prevent middleware from redirecting back to the previous language on the root path.
+  document.addEventListener("change", (e) => {
+    const target = e.target
+    if (target instanceof HTMLSelectElement && target.closest("starlight-lang-select")) {
+      const newPath = target.value
+      let locale = "en"
+      // Extract locale from path (e.g., /docs/ko/ -> ko)
+      const match = newPath.match(/^\/docs\/([^/]+)/)
+      if (match) {
+        const potentialLocale = match[1]
+        const supportedLocales = [
+          "ar",
+          "bs",
+          "da",
+          "de",
+          "es",
+          "fr",
+          "it",
+          "ja",
+          "ko",
+          "nb",
+          "pl",
+          "pt-br",
+          "ru",
+          "th",
+          "tr",
+          "zh-cn",
+          "zh-tw",
+        ]
+        if (supportedLocales.includes(potentialLocale)) {
+          locale = potentialLocale
+        }
+      }
+      document.cookie = `oc_locale=${locale}; Path=/; Max-Age=31536000; SameSite=Lax`
+    }
+  })
+</script>
+
 <style>
   footer.doc {
     margin-top: 3rem;