diff --git a/src/pages/(exam)/ExamPage.tsx b/src/pages/(exam)/ExamPage.tsx
index bfb491b5..fb212a77 100644
--- a/src/pages/(exam)/ExamPage.tsx
+++ b/src/pages/(exam)/ExamPage.tsx
@@ -329,6 +329,7 @@ export default function ExamPage({
 
   useEffect(() => {
     setOnFocusLayerMouseEnter(() => () => setShowAbandonPopup(true));
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   useEffect(() => {
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 872b6f46..f5b32313 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -32,7 +32,7 @@ export default function App({ Component, pageProps }: AppProps) {
       setLoading(true);
     };
     const end = () => {
-     setLoading(false);
+      setLoading(false);
     };
     Router.events.on("routeChangeStart", start);
     Router.events.on("routeChangeComplete", end);
@@ -59,13 +59,11 @@ export default function App({ Component, pageProps }: AppProps) {
     }
   }, [setIsSidebarMinimized]);
 
-  return (
+  return pageProps?.user ? (
     <Layout user={pageProps.user} entities={entities} refreshPage={loading}>
-      {loading ? (
-        <UserProfileSkeleton />
-      ) : (
-        <Component {...pageProps} />
-      )}
+      {loading ? <UserProfileSkeleton /> : <Component {...pageProps} />}
     </Layout>
+  ) : (
+    <Component {...pageProps} />
   );
 }