diff --git a/package-lock.json b/package-lock.json
index 9fa5924cb..4b9216924 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
 				"react-icons": "^4.8.0",
 				"react-loading-skeleton": "^3.4.0",
 				"react-quill": "^2.0.0",
-				"react-router-dom": "^6.11.0",
+				"react-router-dom": "^7.18.4",
 				"react-select": "^5.7.2",
 				"react-virtualized": "^9.22.5",
 				"tailwind-merge": "^3.3.1",
@@ -3977,14 +3977,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/@remix-run/router": {
-			"version": "1.23.2",
-			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.2.tgz",
-			"integrity": "sha512-Ic6m2U/rMjTkhERIa/0ZtXJP17QUi2CbWE7cqx4J58M8aA3QTfW+2UlQ4psvTX9IO1RfNVhK3pcpdjej7L+t2w==",
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
 		"node_modules/@rtsao/scc": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -20927,33 +20919,54 @@
 			}
 		},
 		"node_modules/react-router": {
-			"version": "6.30.3",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.3.tgz",
-			"integrity": "sha512-XRnlbKMTmktBkjCLE8/XcZFlnHvr2Ltdr1eJX4idL55/9BbORzyZEaIkBFDhFGCEWBBItsVrDxwx3gnisMitdw==",
+			"version": "7.18.4",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.4.tgz",
+			"integrity": "sha512-PUPQcMhMGRAslLcvtlPz/kmzBEWPhLdgLFrL7pLNepBL6dX0lWj4WD2cUYVgYCuT3jxvghYFg81cDTj44DhetQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@remix-run/router": "1.23.2"
+				"cookie": "^1.0.1",
+				"set-cookie-parser": "^2.6.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.30.3",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.3.tgz",
-			"integrity": "sha512-pxPcv1AczD4vso7G4Z3TKcvlxK7g7TNt3/FNGMhfqyntocvYKj+GCatfigGDjbLozC4baguJ0ReCigoDJXb0ag==",
+			"version": "7.18.4",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.4.tgz",
+			"integrity": "sha512-yrfmJHIpDG7taCpqKjT1G5B6q3O2K+RN8/fgNf0lTjCwiPbQ0ei6vXX9ZjQR+7ld8Tr7Z5xmyMnZ8YJrphWQUw==",
+			"license": "MIT",
 			"dependencies": {
-				"@remix-run/router": "1.23.2",
-				"react-router": "6.30.3"
+				"react-router": "7.18.4"
 			},
 			"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-router/node_modules/cookie": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
+			"integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/express"
 			}
 		},
 		"node_modules/react-select": {
@@ -22253,6 +22266,12 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/set-cookie-parser": {
+			"version": "2.7.2",
+			"resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+			"integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
+			"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",
diff --git a/package.json b/package.json
index 59193eff2..2411422f2 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
 		"react-icons": "^4.8.0",
 		"react-loading-skeleton": "^3.4.0",
 		"react-quill": "^2.0.0",
-		"react-router-dom": "^6.11.0",
+		"react-router-dom": "^7.18.4",
 		"react-select": "^5.7.2",
 		"react-virtualized": "^9.22.5",
 		"tailwind-merge": "^3.3.1",