diff --git a/package-lock.json b/package-lock.json
index 243134f32..fceb81568 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
         "react-error-overlay": "^6.0.9",
         "react-google-recaptcha": "^2.1.0",
         "react-iframe": "^1.8.0",
-        "react-router-dom": "^5.2.0",
+        "react-router-dom": "^6.30.1",
         "react-scripts": "5.0.1",
         "react-transition-group": "^4.4.2",
         "universal-cookie": "^4.0.4"
@@ -3192,6 +3192,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@remix-run/router": {
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
+      "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -9646,19 +9655,6 @@
         "he": "bin/he"
       }
     },
-    "node_modules/history": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
-      "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"
-      }
-    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -10712,7 +10708,8 @@
     "node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
     },
     "node_modules/isexe": {
       "version": "2.0.0",
@@ -15045,6 +15042,7 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
       "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "isarray": "0.0.1"
@@ -16861,54 +16859,35 @@
       }
     },
     "node_modules/react-router": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.3.tgz",
-      "integrity": "sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==",
+      "version": "6.30.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.1.tgz",
+      "integrity": "sha512-X1m21aEmxGXqENEPG3T6u0Th7g0aS4ZmoNynhbs+Cn+q+QGTLt+d5IQ2bHAXKzKcxGJjxACpVbnYQSCRcfxHlQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.12.13",
-        "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"
+        "@remix-run/router": "1.23.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "react": ">=15"
+        "react": ">=16.8"
       }
     },
     "node_modules/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==",
+      "version": "6.30.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.1.tgz",
+      "integrity": "sha512-llKsgOkZdbPU1Eg3zK8lCn+sjD9wMRZZPuzmdWWX5SUs8OFkN5HnFVC0u5KMeMaC9aoancFI/KoLuKPqN+hxHw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.12.13",
-        "history": "^4.9.0",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.6.2",
-        "react-router": "5.3.3",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
+        "@remix-run/router": "1.23.0",
+        "react-router": "6.30.1"
       },
-      "peerDependencies": {
-        "react": ">=15"
-      }
-    },
-    "node_modules/react-router/node_modules/mini-create-react-context": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
-      "integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dependencies": {
-        "@babel/runtime": "^7.12.1",
-        "tiny-warning": "^1.0.3"
+      "engines": {
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "prop-types": "^15.0.0",
-        "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
       }
     },
     "node_modules/react-scripts": {
@@ -17629,11 +17608,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/resolve-pathname": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
-    },
     "node_modules/resolve-url-loader": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
@@ -19607,16 +19581,6 @@
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
-    "node_modules/tiny-invariant": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz",
-      "integrity": "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg=="
-    },
-    "node_modules/tiny-warning": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -20129,11 +20093,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/value-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/package.json b/package.json
index 69b806a0b..0ce848a7c 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "react-error-overlay": "^6.0.9",
     "react-google-recaptcha": "^2.1.0",
     "react-iframe": "^1.8.0",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^6.30.1",
     "react-scripts": "5.0.1",
     "react-transition-group": "^4.4.2",
     "universal-cookie": "^4.0.4"
diff --git a/src/Components/Routing/PrivateRoute.js b/src/Components/Routing/PrivateRoute.js
index a2672ac1d..125c7c44c 100644
--- a/src/Components/Routing/PrivateRoute.js
+++ b/src/Components/Routing/PrivateRoute.js
@@ -1,19 +1,15 @@
 import React from 'react';
-import { Route, Redirect } from 'react-router-dom';
+import { Navigate, useLocation } from 'react-router-dom';
 import { membershipState } from '../../Enums';
 import { allowedIf } from '../../Routes';
 import { useUser } from '../../Components/context/UserContext';
 import { useAuth } from '../../Components/context/AuthContext';
 
-export default function PrivateRoute({
-  component: Component,
-  appProps,
-  ...params
-}) {
+export default function PrivateRoute({ element: Component, appProps, ...params }) {
   const { user } = useUser();
   const { authenticated } = useAuth();
+  const location = useLocation();
 
-  // Check if the user's access level matches with route's access grant
   const PERMISSION_LOOKUP_TABLE = {
     [allowedIf.MEMBER]: user?.accessLevel >= membershipState.MEMBER,
     [allowedIf.OFFICER_OR_ADMIN]: user?.accessLevel >= membershipState.OFFICER,
@@ -23,36 +19,11 @@ export default function PrivateRoute({
 
   const isAllowed = PERMISSION_LOOKUP_TABLE[appProps.allowed] ?? false;
 
-  return (
-    <Route
-      {...params}
-      render={(props) => {
-        if (isAllowed) {
-          return <Component {...appProps} {...props} />;
-        } else if (authenticated) {
-          return (
-            <Redirect
-              to={{
-                pathname: '/',
-              }}
-            />
-          );
-        } else {
-          return (
-            <Route
-              render={(props) => (
-                <Redirect
-                  to={{
-                    pathname:
-                      '/login?redirect=' + encodeURIComponent(params.location.pathname),
-                    state: { from: props.location },
-                  }}
-                />
-              )}
-            />
-          );
-        }
-      }}
-    />
-  );
+  if (isAllowed) {
+    return React.cloneElement(Component, { ...appProps });
+  } else if (authenticated) {
+    return <Navigate to="/" replace />;
+  } else {
+    return <Navigate to={`/login?redirect=${encodeURIComponent(location.pathname)}`} state={{ from: location }} replace />;
+  }
 }
diff --git a/src/Pages/Messaging/Messaging.js b/src/Pages/Messaging/Messaging.js
index 6b2cb2f0c..b9d062108 100644
--- a/src/Pages/Messaging/Messaging.js
+++ b/src/Pages/Messaging/Messaging.js
@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import { sendMessage, connectToRoom } from '../../APIFunctions/Messaging';
-import { useParams, useHistory } from 'react-router-dom/cjs/react-router-dom.min';
+import { useParams, useNavigate } from 'react-router-dom';
 import { useUser } from '../../Components/context/UserContext';
 
 export default function Messaging() {
   const { id } = useParams();
-  const history = useHistory();
+  const history = useNavigate();
   const { user } = useUser();
   const [roomIdInput, setRoomIdInput] = useState(id || '');
   const [roomIdSubmit, setRoomIdSubmit] = useState(id || 'general');
diff --git a/src/Routing.js b/src/Routing.js
index f4590a4d5..e13f2fbbb 100644
--- a/src/Routing.js
+++ b/src/Routing.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
 
 import PrivateRoute from './Components/Routing/PrivateRoute';
 import NavBarWrapper from './Components/Navbar/NavBarWrapper';
@@ -19,7 +19,7 @@ export default function Routing({ appProps }) {
 
   return (
     <div>
-      <Switch>
+      <Routes>
         {signedInRoutes.map(
           ({
             path,
@@ -40,34 +40,33 @@ export default function Routing({ appProps }) {
               />);
             }
             return (
-              <PrivateRoute
+              <Route
                 key={index}
-                exact
                 path={path}
-                appProps={{
-                  allowed: allowedIf,
-                  redirect,
-                  ...appProps
-                }}
-                component={props => getCorrectComponent(props)}
+                element={
+                  <PrivateRoute
+                    appProps={{
+                      allowed: allowedIf,
+                      redirect,
+                      ...appProps
+                    }}
+                  >
+                    {getCorrectComponent({})}
+                  </PrivateRoute>
+                }
               />
             );
           }
         )}
-        {signedOutRoutes.map(({ path, Component }, index) => {
-          return (
-            <Route
-              key={index}
-              exact
-              path={path}
-              render={props => (
-                <NavBarWrapper component={Component} {...props} {...appProps} />
-              )}
-            />
-          );
-        })}
-        <Route component={NotFoundPage} />
-      </Switch>
+        {signedOutRoutes.map(({ path, Component }, index) => (
+          <Route
+            key={index}
+            path={path}
+            element={<NavBarWrapper component={Component} {...appProps} />}
+          />
+        ))}
+        <Route path="*" element={<NotFoundPage />} />
+      </Routes>
     </div>
   );
 }