diff --git a/frontend/cypress.config.ts b/frontend/cypress.config.ts
index 617b6f7fb..bfd30ae67 100644
--- a/frontend/cypress.config.ts
+++ b/frontend/cypress.config.ts
@@ -1,5 +1,5 @@
 export default {
-  pageloadTimeout: 200000,
+  pageloadTimeout: 2000000,
   e2e: {
     setupNodeEvents(on, config) {
       // implement node event listeners here
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 3c41e5d8f..94f3cfb2d 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -32,8 +32,7 @@ function App() {
   const setOrgInfoToStore = useGlobalStore((state) => state.setOrgInfo);
   const { refetch } = useQuery(
     ["organization"],
-    () =>
-      Organization.get().then((res) => res[0]),
+    () => Organization.get().then((res) => res[0]),
     {
       onSuccess: (data) => {
         const storeOrgObject: IOrgStoreType = {
@@ -71,16 +70,15 @@ function App() {
     isAuthenticated: boolean;
   }>(["session"], fetchSessionInfo, { refetchInterval: 60000 });
 
-  const isAuthenticated = isLoading ? false : sessionData?.isAuthenticated;
+  const isAuthenticated =
+    isLoading && !sessionData ? false : sessionData?.isAuthenticated;
 
-  const contextClass = {
-    success: "bg-[#cca43b] text-[#cca43b]",
-  };
   useEffect(() => {
     if (isAuthenticated) {
       refetch();
     }
   }, [isAuthenticated]);
+
   if (isLoading) {
     return (
       <div className="flex h-screen">
@@ -90,32 +88,31 @@ function App() {
       </div>
     );
   }
-    if (isAuthenticated) {
-      return (
-        <div>
-          <ToastContainer
-            autoClose={3000}
-            bodyClassName=" text-gold font-main"
-            position="top-center"
-          />
-          <PlanProvider>
-            <AppRoutes />
-          </PlanProvider>
-        </div>
-      );
-    }
-      return (
-        <div>
-          <ToastContainer
-            autoClose={3000}
-            toastClassName="rounded-md bg-background font-main"
-            bodyClassName=" text-gold font-main"
-          />
-          <ExternalRoutes />
-        </div>
-      );
-
 
+  if (isAuthenticated) {
+    return (
+      <div>
+        <ToastContainer
+          autoClose={3000}
+          bodyClassName=" text-gold font-main"
+          position="top-center"
+        />
+        <PlanProvider>
+          <AppRoutes />
+        </PlanProvider>
+      </div>
+    );
+  }
+  return (
+    <div>
+      <ToastContainer
+        autoClose={3000}
+        toastClassName="rounded-md bg-background font-main"
+        bodyClassName=" text-gold font-main"
+      />
+      <ExternalRoutes />
+    </div>
+  );
 }
 
 export default App;