diff --git a/client/package-lock.json b/client/package-lock.json
index c00978d4..e4cb2294 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -23,7 +23,7 @@
                 "react-dom": "^19.0.0",
                 "react-helmet": "^6.1.0",
                 "react-i18next": "^12.3.1",
-                "react-router-dom": "^6.28.0",
+                "react-router-dom": "^7.0.0",
                 "react-use-cookie": "^1.6.1",
                 "recoil": "^0.7.7",
                 "use-query-params": "^2.2.1",
@@ -988,14 +988,6 @@
                 "url": "https://opencollective.com/popperjs"
             }
         },
-        "node_modules/@remix-run/router": {
-            "version": "1.21.0",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz",
-            "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==",
-            "engines": {
-                "node": ">=14.0.0"
-            }
-        },
         "node_modules/@rollup/rollup-android-arm-eabi": {
             "version": "4.28.1",
             "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz",
@@ -1279,6 +1271,12 @@
                 "@babel/types": "^7.20.7"
             }
         },
+        "node_modules/@types/cookie": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+            "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+            "license": "MIT"
+        },
         "node_modules/@types/estree": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -1612,6 +1610,15 @@
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
             "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
         },
+        "node_modules/cookie": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+            "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/copy-to-clipboard": {
             "version": "3.3.3",
             "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
@@ -2597,35 +2604,43 @@
             }
         },
         "node_modules/react-router": {
-            "version": "6.28.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.1.tgz",
-            "integrity": "sha512-2omQTA3rkMljmrvvo6WtewGdVh45SpL9hGiCI9uUrwGGfNFDIvGK4gYJsKlJoNVi6AQZcopSCballL+QGOm7fA==",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.0.tgz",
+            "integrity": "sha512-VcFhWqkNIcojDRYaUO8qV0Jib52s9ULpCp3nkBbmrvtoCVFRp6tmk3tJ2w9BZauVctA1YRnJlFYDn9iJRuCpGA==",
             "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.21.0"
+                "@types/cookie": "^0.6.0",
+                "cookie": "^1.0.1",
+                "set-cookie-parser": "^2.6.0",
+                "turbo-stream": "2.4.0"
             },
             "engines": {
-                "node": ">=14.0.0"
+                "node": ">=20.0.0"
             },
             "peerDependencies": {
-                "react": ">=16.8"
+                "react": ">=18",
+                "react-dom": ">=18"
+            },
+            "peerDependenciesMeta": {
+                "react-dom": {
+                    "optional": true
+                }
             }
         },
         "node_modules/react-router-dom": {
-            "version": "6.28.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.1.tgz",
-            "integrity": "sha512-YraE27C/RdjcZwl5UCqF/ffXnZDxpJdk9Q6jw38SZHjXs7NNdpViq2l2c7fO7+4uWaEfcwfGCv3RSg4e1By/fQ==",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.0.tgz",
+            "integrity": "sha512-F4/nYBC9e4s0/ZjxM8GkZ9a68DpX76LN1a9W9mfPl2GfbDJ9/vzJro6MThNR5qGBH6KkgcK1BziyEzXhHV46Xw==",
             "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.21.0",
-                "react-router": "6.28.1"
+                "react-router": "7.1.0"
             },
             "engines": {
-                "node": ">=14.0.0"
+                "node": ">=20.0.0"
             },
             "peerDependencies": {
-                "react": ">=16.8",
-                "react-dom": ">=16.8"
+                "react": ">=18",
+                "react-dom": ">=18"
             }
         },
         "node_modules/react-side-effect": {
@@ -2792,6 +2807,12 @@
                 "seroval": "^1.0"
             }
         },
+        "node_modules/set-cookie-parser": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+            "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+            "license": "MIT"
+        },
         "node_modules/solid-js": {
             "version": "1.9.3",
             "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.3.tgz",
@@ -2861,6 +2882,12 @@
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
             "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
         },
+        "node_modules/turbo-stream": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+            "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
+            "license": "ISC"
+        },
         "node_modules/typescript": {
             "version": "5.7.2",
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
diff --git a/client/package.json b/client/package.json
index c00049df..bb19b928 100644
--- a/client/package.json
+++ b/client/package.json
@@ -38,7 +38,7 @@
         "react-dom": "^19.0.0",
         "react-helmet": "^6.1.0",
         "react-i18next": "^12.3.1",
-        "react-router-dom": "^6.28.0",
+        "react-router-dom": "^7.0.0",
         "react-use-cookie": "^1.6.1",
         "recoil": "^0.7.7",
         "use-query-params": "^2.2.1",