diff --git a/package-lock.json b/package-lock.json
index 59c3a0e09..d485d6585 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,7 +69,7 @@
 				"react-i18next": "^14.0.5",
 				"react-refresh": "^0.14.0",
 				"react-responsive": "^9.0.2",
-				"react-router-dom": "5.2.0",
+				"react-router-dom": "^6.0.0",
 				"react-select": "4.3.1",
 				"react-switch": "^6.0.0",
 				"react-use-measure": "^2.1.1",
@@ -13420,15 +13420,12 @@
 			"license": "MIT"
 		},
 		"node_modules/history": {
-			"version": "4.10.1",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+			"integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.1.2",
-				"loose-envify": "^1.2.0",
-				"resolve-pathname": "^3.0.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0",
-				"value-equal": "^1.0.1"
+				"@babel/runtime": "^7.7.6"
 			}
 		},
 		"node_modules/hoist-non-react-statics": {
@@ -14693,6 +14690,7 @@
 		},
 		"node_modules/isarray": {
 			"version": "0.0.1",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/isexe": {
@@ -16376,18 +16374,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/mini-create-react-context": {
-			"version": "0.4.1",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.12.1",
-				"tiny-warning": "^1.0.3"
-			},
-			"peerDependencies": {
-				"prop-types": "^15.0.0",
-				"react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
-			}
-		},
 		"node_modules/mini-css-extract-plugin": {
 			"version": "2.7.7",
 			"license": "MIT",
@@ -17337,13 +17323,6 @@
 				"node": "14 || >=16.14"
 			}
 		},
-		"node_modules/path-to-regexp": {
-			"version": "1.8.0",
-			"license": "MIT",
-			"dependencies": {
-				"isarray": "0.0.1"
-			}
-		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
 			"license": "MIT",
@@ -19635,44 +19614,30 @@
 			}
 		},
 		"node_modules/react-router": {
-			"version": "5.2.0",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.0.0.tgz",
+			"integrity": "sha512-FcTRCihYZvERMNbG54D9+Wkv2cj/OtoxNlA/87D7vxKYlmSmbF9J9XChI9Is44j/behEiOhbovgVZBhKQn+wgA==",
 			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.1.2",
-				"history": "^4.9.0",
-				"hoist-non-react-statics": "^3.1.0",
-				"loose-envify": "^1.3.1",
-				"mini-create-react-context": "^0.4.0",
-				"path-to-regexp": "^1.7.0",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.6.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"history": "^5.0.3"
 			},
 			"peerDependencies": {
-				"react": ">=15"
+				"react": ">=16.8"
 			}
 		},
 		"node_modules/react-router-dom": {
-			"version": "5.2.0",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.0.tgz",
+			"integrity": "sha512-bPXyYipf0zu6K7mHSEmNO5YqLKq2q9N+Dsahw9Xh3oq1IirsI3vbnIYcVWin6A0zWyHmKhMGoV7Gr0j0kcuVFg==",
 			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.1.2",
-				"history": "^4.9.0",
-				"loose-envify": "^1.3.1",
-				"prop-types": "^15.6.2",
-				"react-router": "5.2.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"react-router": "6.0.0"
 			},
 			"peerDependencies": {
-				"react": ">=15"
+				"react": ">=16.8",
+				"react-dom": ">=16.8"
 			}
 		},
-		"node_modules/react-router/node_modules/react-is": {
-			"version": "16.13.1",
-			"license": "MIT"
-		},
 		"node_modules/react-select": {
 			"version": "4.3.1",
 			"license": "MIT",
@@ -20270,10 +20235,6 @@
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/resolve-pathname": {
-			"version": "3.0.0",
-			"license": "MIT"
-		},
 		"node_modules/resolve-url-loader": {
 			"version": "5.0.0",
 			"license": "MIT",
@@ -22464,14 +22425,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/tiny-invariant": {
-			"version": "1.3.1",
-			"license": "MIT"
-		},
-		"node_modules/tiny-warning": {
-			"version": "1.0.3",
-			"license": "MIT"
-		},
 		"node_modules/tlds": {
 			"version": "1.249.0",
 			"license": "MIT",
@@ -23225,10 +23178,6 @@
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"node_modules/value-equal": {
-			"version": "1.0.1",
-			"license": "MIT"
-		},
 		"node_modules/vary": {
 			"version": "1.1.2",
 			"dev": true,
diff --git a/package.json b/package.json
index ab7b6d9ed..f249f775e 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
 		"react-i18next": "^14.0.5",
 		"react-refresh": "^0.14.0",
 		"react-responsive": "^9.0.2",
-		"react-router-dom": "5.2.0",
+		"react-router-dom": "6.0.0",
 		"react-select": "4.3.1",
 		"react-switch": "^6.0.0",
 		"react-use-measure": "^2.1.1",