diff --git a/website/package-lock.json b/website/package-lock.json
index d7bfb600..0c92c0db 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -41,7 +41,7 @@
         "npm": "^9.2.0",
         "postcss-focus-visible": "^7.1.0",
         "react": "18.2.0",
-        "react-cookies": "^0.1.1",
+        "react-cookie": "^4.1.1",
         "react-dom": "18.2.0",
         "react-feature-flags": "^1.0.0",
         "react-hook-form": "^7.42.1",
@@ -33113,21 +33113,17 @@
         "react": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/react-cookies": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/react-cookies/-/react-cookies-0.1.1.tgz",
-      "integrity": "sha512-PP75kJ4vtoHuuTdq0TAD3RmlAv7vuDQh9fkC4oDlhntgs9vX1DmREomO0Y1mcQKR9nMZ6/zxoflaMJ3MAmF5KQ==",
+    "node_modules/react-cookie": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
+      "integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
       "dependencies": {
-        "cookie": "^0.3.1",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "node_modules/react-cookies/node_modules/cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw==",
-      "engines": {
-        "node": ">= 0.6"
+        "@types/hoist-non-react-statics": "^3.0.1",
+        "hoist-non-react-statics": "^3.0.0",
+        "universal-cookie": "^4.0.0"
+      },
+      "peerDependencies": {
+        "react": ">= 16.3.0"
       }
     },
     "node_modules/react-docgen": {
@@ -36887,6 +36883,28 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/universal-cookie": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
+      "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
+      "dependencies": {
+        "@types/cookie": "^0.3.3",
+        "cookie": "^0.4.0"
+      }
+    },
+    "node_modules/universal-cookie/node_modules/@types/cookie": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+      "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
+    },
+    "node_modules/universal-cookie/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -63150,20 +63168,14 @@
         "@babel/runtime": "^7.12.13"
       }
     },
-    "react-cookies": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/react-cookies/-/react-cookies-0.1.1.tgz",
-      "integrity": "sha512-PP75kJ4vtoHuuTdq0TAD3RmlAv7vuDQh9fkC4oDlhntgs9vX1DmREomO0Y1mcQKR9nMZ6/zxoflaMJ3MAmF5KQ==",
+    "react-cookie": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.1.1.tgz",
+      "integrity": "sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==",
       "requires": {
-        "cookie": "^0.3.1",
-        "object-assign": "^4.1.1"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw=="
-        }
+        "@types/hoist-non-react-statics": "^3.0.1",
+        "hoist-non-react-statics": "^3.0.0",
+        "universal-cookie": "^4.0.0"
       }
     },
     "react-docgen": {
@@ -66057,6 +66069,27 @@
         "unist-util-is": "^4.0.0"
       }
     },
+    "universal-cookie": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
+      "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
+      "requires": {
+        "@types/cookie": "^0.3.3",
+        "cookie": "^0.4.0"
+      },
+      "dependencies": {
+        "@types/cookie": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+          "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
+        },
+        "cookie": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+        }
+      }
+    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
diff --git a/website/package.json b/website/package.json
index c263a1de..25fee307 100644
--- a/website/package.json
+++ b/website/package.json
@@ -58,7 +58,7 @@
     "npm": "^9.2.0",
     "postcss-focus-visible": "^7.1.0",
     "react": "18.2.0",
-    "react-cookies": "^0.1.1",
+    "react-cookie": "^4.1.1",
     "react-dom": "18.2.0",
     "react-feature-flags": "^1.0.0",
     "react-hook-form": "^7.42.1",
diff --git a/website/src/components/LanguageSelector/LanguageSelector.tsx b/website/src/components/LanguageSelector/LanguageSelector.tsx
index aea25dcd..5c2469b4 100644
--- a/website/src/components/LanguageSelector/LanguageSelector.tsx
+++ b/website/src/components/LanguageSelector/LanguageSelector.tsx
@@ -1,13 +1,25 @@
 import { Select } from "@chakra-ui/react";
 import { useRouter } from "next/router";
 import { useTranslation } from "next-i18next";
-import { useCallback, useMemo } from "react";
-import cookie from "react-cookies";
+import { useCallback, useEffect, useMemo } from "react";
+import { useCookies } from "react-cookie";
 
 const LanguageSelector = () => {
   const router = useRouter();
+  const [cookies, setCookie] = useCookies(["NEXT_LOCALE"]);
   const { i18n } = useTranslation();
 
+  // Inspect the cookie based locale and the router based locale.  If the user
+  // has manually set the locale via URL, they will differ.  In that condition,
+  // update the cookie.
+  useEffect(() => {
+    const localeCookie = cookies["NEXT_LOCALE"];
+    const localeRouter = router.locale;
+    if (localeRouter !== localeCookie) {
+      setCookie("NEXT_LOCALE", localeRouter, { path: "/" });
+    }
+  }, [cookies, setCookie, router]);
+
   // Memo the set of locales and their display names.
   const localesAndNames = useMemo(() => {
     return router.locales.map((locale) => ({
@@ -19,7 +31,7 @@ const LanguageSelector = () => {
   const languageChanged = useCallback(
     async (option) => {
       const locale = option.target.value;
-      cookie.save("NEXT_LOCALE", locale, { path: "/" });
+      setCookie("NEXT_LOCALE", locale, { path: "/" });
       const path = router.asPath;
       return router.push(path, path, { locale });
     },