diff --git a/ArtisanConnect/app/(tabs)/index.jsx b/ArtisanConnect/app/(tabs)/index.jsx
index 63d8a26..b9b3099 100644
--- a/ArtisanConnect/app/(tabs)/index.jsx
+++ b/ArtisanConnect/app/(tabs)/index.jsx
@@ -15,15 +15,15 @@ export default function Home() {
   const [isReady, setIsReady] = useState(false);
   const fetchNotices = useNoticesStore((state) => state.fetchNotices);
 
-  // useEffect(() => {
-  //   setIsReady(true);
-  // }, []);
+  useEffect(() => {
+    setIsReady(true);
+  }, []);
 
-  // useEffect(() => {
-  //   if (isReady && !token) {
-  //     router.replace("/login");
-  //   }
-  // }, [isReady, token, router]);
+  useEffect(() => {
+    if (isReady && !token) {
+      router.replace("/login");
+    }
+  }, [isReady, token, router]);
 
   useEffect(() => {
     if (token) {
diff --git a/ArtisanConnect/components/UserSection.jsx b/ArtisanConnect/components/UserSection.jsx
index cf4008f..578c56d 100644
--- a/ArtisanConnect/components/UserSection.jsx
+++ b/ArtisanConnect/components/UserSection.jsx
@@ -20,7 +20,9 @@ export function UserSection({ notices, title }) {
       }
     };
 
-    fetchUsers();
+    if (token) {
+        fetchUsers();
+    }
   }, [token]);
 
   const usersWithNoticeCount =