diff --git a/commafeed-client/package-lock.json b/commafeed-client/package-lock.json
index 628be014..f8f57957 100644
--- a/commafeed-client/package-lock.json
+++ b/commafeed-client/package-lock.json
@@ -38,7 +38,7 @@
                 "react-icons": "^5.3.0",
                 "react-infinite-scroller": "^1.2.6",
                 "react-redux": "^9.1.2",
-                "react-router-dom": "^6.28.0",
+                "react-router-dom": "^7.0.1",
                 "react-swipeable": "^7.0.2",
                 "redoc": "^2.2.0",
                 "style-to-object": "^1.0.8",
@@ -1703,15 +1703,6 @@
                 }
             }
         },
-        "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==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=14.0.0"
-            }
-        },
         "node_modules/@rollup/rollup-android-arm-eabi": {
             "version": "4.27.2",
             "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.2.tgz",
@@ -2015,6 +2006,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",
@@ -3043,6 +3040,15 @@
             "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
             "license": "MIT"
         },
+        "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/core-js": {
             "version": "3.39.0",
             "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
@@ -6421,35 +6427,43 @@
             }
         },
         "node_modules/react-router": {
-            "version": "6.28.0",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz",
-            "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.1.tgz",
+            "integrity": "sha512-WVAhv9oWCNsja5AkK6KLpXJDSJCQizOIyOd4vvB/+eHGbYx5vkhcmcmwWjQ9yqkRClogi+xjEg9fNEOd5EX/tw==",
             "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.0",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz",
-            "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.1.tgz",
+            "integrity": "sha512-duBzwAAiIabhFPZfDjcYpJ+f08TMbPMETgq254GWne2NW1ZwRHhZLj7tpSp8KGb7JvZzlLcjGUnqLxpZQVEPng==",
             "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.21.0",
-                "react-router": "6.28.0"
+                "react-router": "7.0.1"
             },
             "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-shallow-renderer": {
@@ -6995,6 +7009,12 @@
                 "semver": "bin/semver.js"
             }
         },
+        "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/set-function-length": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -7598,6 +7618,12 @@
                 }
             }
         },
+        "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/type-fest": {
             "version": "4.27.0",
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.27.0.tgz",
diff --git a/commafeed-client/package.json b/commafeed-client/package.json
index e5ab3a11..e0b64b69 100644
--- a/commafeed-client/package.json
+++ b/commafeed-client/package.json
@@ -45,7 +45,7 @@
         "react-icons": "^5.3.0",
         "react-infinite-scroller": "^1.2.6",
         "react-redux": "^9.1.2",
-        "react-router-dom": "^6.28.0",
+        "react-router-dom": "^7.0.1",
         "react-swipeable": "^7.0.2",
         "redoc": "^2.2.0",
         "style-to-object": "^1.0.8",