diff --git a/Client/src/App.jsx b/Client/src/App.jsx
index 65ba6fc21..0814f8c13 100644
--- a/Client/src/App.jsx
+++ b/Client/src/App.jsx
@@ -1,5 +1,5 @@
 import { useEffect } from "react";
-import { Routes, Route } from "react-router-dom";
+import { Routes, Route, Navigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { useDispatch } from "react-redux";
 // import "./App.css";
@@ -79,7 +79,8 @@ function App() {
 					<Route
 						exact
 						path="/"
-						element={<ProtectedRoute Component={MonitorsWithAdminProp} />}
+						/* TODO redirect to /monitors */
+						element={<Navigate to="/monitors" />}
 					/>
 					<Route
 						path="/monitors"
diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx
index 948f875c0..810ec8f21 100644
--- a/Client/src/Components/Sidebar/index.jsx
+++ b/Client/src/Components/Sidebar/index.jsx
@@ -114,7 +114,6 @@ function Sidebar() {
 	const [popup, setPopup] = useState();
 	const { user } = useSelector((state) => state.auth);
 
-	// Remove demo password if demo
 	const accountMenuItem = menu.find((item) => item.name === "Account");
 	if (user.role?.includes("demo") && accountMenuItem) {
 		accountMenuItem.nested = accountMenuItem.nested.filter((item) => {
@@ -149,7 +148,7 @@ function Sidebar() {
 		if (matchedKey) {
 			setOpen((prev) => ({ ...prev, [PATH_MAP[matchedKey]]: true }));
 		}
-	}, []);
+	}, [location]);
 
 	return (
 		<Stack
@@ -304,6 +303,7 @@ function Sidebar() {
 							</ListItemButton>
 						</Tooltip>
 					) : collapsed ? (
+						/* TODO Do we ever get here? */
 						<React.Fragment key={item.name}>
 							<Tooltip
 								placement="right"