diff --git a/apps/next-app/src/pages/_app.tsx b/apps/next-app/src/pages/_app.tsx
index 1c11412..e945370 100644
--- a/apps/next-app/src/pages/_app.tsx
+++ b/apps/next-app/src/pages/_app.tsx
@@ -7,6 +7,7 @@ import { ReactElement, ReactNode, useState } from 'react';
 import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs';
 import { NextPage } from 'next';
 import { Layout } from 'shared/components/Layout';
+import { ROUTES } from 'constants/ROUTES';
 
 const nunito = Nunito({ subsets: ['latin'], weight: ['300', '500', '700'] });
 
@@ -18,7 +19,11 @@ type CustomAppProps = AppProps & {
   initialSession: Session;
 };
 
-export default function App({ Component, pageProps }: CustomAppProps) {
+export default function App({
+  Component,
+  pageProps,
+  ...appProps
+}: CustomAppProps) {
   const [supabaseClient] = useState(() => createBrowserSupabaseClient());
 
   return (
@@ -28,7 +33,13 @@ export default function App({ Component, pageProps }: CustomAppProps) {
     >
       <AppProviders>
         <main className={nunito.className}>
-          <Component {...pageProps} />)
+          {appProps.router.pathname === ROUTES.PROVIDER ? (
+            <Component {...pageProps} />
+          ) : (
+            <Layout>
+              <Component {...pageProps} />
+            </Layout>
+          )}
         </main>
       </AppProviders>
     </SessionContextProvider>
diff --git a/apps/next-app/src/pages/auth/provider/index.tsx b/apps/next-app/src/pages/auth/provider/index.tsx
index 2499489..1296443 100644
--- a/apps/next-app/src/pages/auth/provider/index.tsx
+++ b/apps/next-app/src/pages/auth/provider/index.tsx
@@ -10,15 +10,12 @@ const Provider = () => {
   useEffect(() => {
     const getSession = async () => {
       const session = await supabase.auth.getSession();
-      console.log('SESSION', session);
-      if (session) {
-        router.replace(ROUTES.DASHBOARD);
-      }
+      router.replace(session ? ROUTES.DASHBOARD : ROUTES.LOGIN);
     };
     getSession();
   }, [router, supabase.auth]);
 
-  return <div>Provider</div>;
+  return null;
 };
 
 export default Provider;