diff --git a/compass/app/home/layout.tsx b/compass/app/home/layout.tsx
index b98493c..236616e 100644
--- a/compass/app/home/layout.tsx
+++ b/compass/app/home/layout.tsx
@@ -15,7 +15,6 @@ export default function RootLayout({
     const [isSidebarOpen, setIsSidebarOpen] = useState(true);
     const [user, setUser] = useState<User>();
     const router = useRouter();
-    const [loading, setLoading] = useState(true);
 
     useEffect(() => {
         async function getUser() {
@@ -36,7 +35,6 @@ export default function RootLayout({
             );
 
             setUser(await userData.json());
-            setLoading(false);
         }
 
         getUser();
@@ -52,7 +50,6 @@ export default function RootLayout({
                         setIsSidebarOpen={setIsSidebarOpen}
                         isSidebarOpen={isSidebarOpen}
                         isAdmin={user.role === Role.ADMIN}
-                        loading={loading}
                     />
                     <div
                         className={`flex-1 transition duration-300 ease-in-out ${
diff --git a/compass/components/Sidebar/Sidebar.tsx b/compass/components/Sidebar/Sidebar.tsx
index 7ab2135..cdd46c6 100644
--- a/compass/components/Sidebar/Sidebar.tsx
+++ b/compass/components/Sidebar/Sidebar.tsx
@@ -9,7 +9,6 @@ import {
     LockClosedIcon,
 } from "@heroicons/react/24/solid";
 import { SidebarItem } from "./SidebarItem";
-import styles from "./LoadingIcon.module.css";
 import { UserProfile } from "../resource/UserProfile";
 import LoadingIcon from "./LoadingIcon";
 
@@ -19,7 +18,6 @@ interface SidebarProps {
     name: string;
     email: string;
     isAdmin: boolean;
-    loading: boolean;
 }
 
 const Sidebar: React.FC<SidebarProps> = ({
@@ -28,7 +26,6 @@ const Sidebar: React.FC<SidebarProps> = ({
     name,
     email,
     isAdmin: admin,
-    loading,
 }) => {
     const [isLoading, setIsLoading] = useState(false);
     return (
diff --git a/compass/components/Sidebar/SidebarItem.tsx b/compass/components/Sidebar/SidebarItem.tsx
index 475f7b5..6a94d91 100644
--- a/compass/components/Sidebar/SidebarItem.tsx
+++ b/compass/components/Sidebar/SidebarItem.tsx
@@ -1,4 +1,5 @@
 import Link from "next/link";
+import { usePathname } from "next/navigation";
 
 interface SidebarItemProps {
     icon: React.ReactElement;
@@ -15,9 +16,13 @@ export const SidebarItem: React.FC<SidebarItemProps> = ({
     redirect,
     onClick,
 }) => {
+    const pathname = usePathname();
+
     return (
         <Link
-            onClick={() => onClick(true)}
+            onClick={() =>
+                pathname.startsWith(redirect) ? onClick(false) : onClick(true)
+            }
             href={redirect}
             className={
                 active