diff --git a/frontend-react/package.json b/frontend-react/package.json
index 70b824c3f22..13f26b7d63d 100644
--- a/frontend-react/package.json
+++ b/frontend-react/package.json
@@ -32,8 +32,8 @@
     "react-loader-spinner": "^6.1.6",
     "react-markdown": "^9.0.1",
     "react-query-kit": "^3.3.0",
-    "react-router": "^6.27.0",
-    "react-router-dom": "^6.27.0",
+    "react-router": "^7.0.1",
+    "react-router-dom": "^7.0.1",
     "react-scroll-sync": "^0.11.2",
     "react-toastify": "^10.0.6",
     "rehype-raw": "^7.0.0",
@@ -185,7 +185,7 @@
     "remark-mdx-toc": "^0.3.1",
     "sass": "^1.80.3",
     "storybook": "^8.3.6",
-    "storybook-addon-remix-react-router": "^3.0.1",
+    "storybook-addon-remix-react-router": "^3.0.2",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.0",
     "typescript": "^5.6.3",
diff --git a/frontend-react/yarn.lock b/frontend-react/yarn.lock
index 5f5f23f5c2e..5b2513f9846 100644
--- a/frontend-react/yarn.lock
+++ b/frontend-react/yarn.lock
@@ -1494,13 +1494,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.20.0":
-  version: 1.20.0
-  resolution: "@remix-run/router@npm:1.20.0"
-  checksum: 6bff41117eabb867b17c89baa727580f0a431368b309cd9a1f69767aafa68ea9cac95ff0eeb86d37c2c8655f5cd7c6283d37ae5e6d93e94f648c6112ddb24ede
-  languageName: node
-  linkType: hard
-
 "@rest-hooks/core@npm:^3.2.4":
   version: 3.2.4
   resolution: "@rest-hooks/core@npm:3.2.4"
@@ -10416,8 +10409,8 @@ __metadata:
     react-loader-spinner: ^6.1.6
     react-markdown: ^9.0.1
     react-query-kit: ^3.3.0
-    react-router: ^6.27.0
-    react-router-dom: ^6.27.0
+    react-router: ^7.0.1
+    react-router-dom: ^7.0.1
     react-scroll-sync: ^0.11.2
     react-toastify: ^10.0.6
     rehype-raw: ^7.0.0
@@ -10429,7 +10422,7 @@ __metadata:
     sanitize-html: ^2.13.1
     sass: ^1.80.3
     storybook: ^8.3.6
-    storybook-addon-remix-react-router: ^3.0.1
+    storybook-addon-remix-react-router: ^3.0.2
     ts-node: ^10.9.2
     tslib: ^2.8.0
     tsx: ^4.19.1
@@ -10559,27 +10552,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.27.0":
-  version: 6.27.0
-  resolution: "react-router-dom@npm:6.27.0"
+"react-router-dom@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "react-router-dom@npm:7.0.1"
   dependencies:
-    "@remix-run/router": 1.20.0
-    react-router: 6.27.0
+    react-router: 7.0.1
   peerDependencies:
-    react: ">=16.8"
-    react-dom: ">=16.8"
-  checksum: de3dcc56297a2879a0e3997fa34ba0f3e1b9986a2ad3ef7991f913902ecf38da0282c98f7834f344ce2d881dbab0a382201a57e9f9ef5e9816febdb26dc038b7
+    react: ">=18"
+    react-dom: ">=18"
+  checksum: 1e71019eb0fe47e1aa4c7d160ba1de389777cb1d8447493655e30b954be41934dcbc7ae364fc3b85cc17f5d49545f412994d450716bf143e8fb1fe61a7e02bd1
   languageName: node
   linkType: hard
 
-"react-router@npm:6.27.0, react-router@npm:^6.27.0":
-  version: 6.27.0
-  resolution: "react-router@npm:6.27.0"
+"react-router@npm:7.0.1, react-router@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "react-router@npm:7.0.1"
   dependencies:
-    "@remix-run/router": 1.20.0
+    "@types/cookie": ^0.6.0
+    cookie: ^1.0.1
+    set-cookie-parser: ^2.6.0
+    turbo-stream: 2.4.0
   peerDependencies:
-    react: ">=16.8"
-  checksum: d22eedc33bcb11891b431655f90eed2d52c2fb3165ad11ca625f62970caf59c4859e6b1a3f92e78902b31ff1a8b2482ebf97ddebb82e9687d1f98730c14e04e6
+    react: ">=18"
+    react-dom: ">=18"
+  peerDependenciesMeta:
+    react-dom:
+      optional: true
+  checksum: 13110d762ce07062b3cfd7097bc2625bfd7df4485836d281338182dd0066517ceb9e9da6bf5dd1070e18fe593f8975031207995c277a4b6fc404b62ba51c91cc
   languageName: node
   linkType: hard
 
@@ -11273,6 +11272,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-cookie-parser@npm:^2.6.0":
+  version: 2.7.1
+  resolution: "set-cookie-parser@npm:2.7.1"
+  checksum: 2ef8b351094712f8f7df6d63ed4b10350b24a5b515772690e7dec227df85fcef5bc451c7765f484fd9f36694ece5438d1456407d017f237d0d3351d7dbbd3587
+  languageName: node
+  linkType: hard
+
 "set-function-length@npm:^1.2.1":
   version: 1.2.2
   resolution: "set-function-length@npm:1.2.2"
@@ -11576,9 +11582,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook-addon-remix-react-router@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "storybook-addon-remix-react-router@npm:3.0.1"
+"storybook-addon-remix-react-router@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "storybook-addon-remix-react-router@npm:3.0.2"
   dependencies:
     compare-versions: ^6.0.0
     react-inspector: 6.0.2
@@ -11592,13 +11598,13 @@ __metadata:
     "@storybook/theming": ^8.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-router-dom: ^6.4.0
+    react-router-dom: ^6.4.0 || ^7.0.0
   peerDependenciesMeta:
     react:
       optional: true
     react-dom:
       optional: true
-  checksum: 29948e53fa1eda1c0cf5aa3e679c5d135578abb468e5d3969cd6eb9a7e24546dde6720d437692c5bdbf2c2c16f5553260933e4b8945da967313b447974d093fe
+  checksum: 725ca79a1050a2141a0bb60e5c25f405a39f6a90be31d7ccecb08a1edda1bd9afa4f4829e71217461a0084aaab8db333ca9f4a1a1169de3ef0d161fdedc170ab
   languageName: node
   linkType: hard
 
@@ -12260,6 +12266,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"turbo-stream@npm:2.4.0":
+  version: 2.4.0
+  resolution: "turbo-stream@npm:2.4.0"
+  checksum: e36f52ed40589f01bede79757a143bef484914d579927235be1fd0c205618994cb5779a39ff8c2a80a87a1464d05771cd75320a9412b15bca03c7ff432e3cdf7
+  languageName: node
+  linkType: hard
+
 "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"