diff --git a/apps/frontend/src/app/(site)/page.tsx b/apps/frontend/src/app/(site)/page.tsx
deleted file mode 100644
index c5bdbcfd..00000000
--- a/apps/frontend/src/app/(site)/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import {redirect} from "next/navigation";
-
-export default async function Page() {
-    return redirect('/analytics');
-}
diff --git a/apps/frontend/src/components/analytics/analytics.component.tsx b/apps/frontend/src/components/analytics/analytics.component.tsx
index 00b43a09..acebdf7d 100644
--- a/apps/frontend/src/components/analytics/analytics.component.tsx
+++ b/apps/frontend/src/components/analytics/analytics.component.tsx
@@ -47,7 +47,7 @@ export const AnalyticsComponent: FC = () => {
         <div className="flex flex-1 flex-col gap-[15px] min-h-[426px]">
           <h2 className="text-[24px]">Stars per day</h2>
           <div className="flex-1 bg-secondary">
-            <StarsTableComponent stars={stars.stars} />
+            {!!stars?.stars?.length ? <StarsTableComponent stars={stars.stars} /> : <div className="py-[24px] px-[16px]">Load your GitHub repository from settings to see analytics</div>}
           </div>
         </div>
       </div>
diff --git a/apps/frontend/src/components/layout/layout.settings.tsx b/apps/frontend/src/components/layout/layout.settings.tsx
index d7523a19..e2dbcfa1 100644
--- a/apps/frontend/src/components/layout/layout.settings.tsx
+++ b/apps/frontend/src/components/layout/layout.settings.tsx
@@ -23,10 +23,7 @@ export const LayoutSettings = ({ children }: { children: ReactNode }) => {
     return await (await fetch(path)).json();
   }, []);
 
-  const { data: user } = useSWR(
-    '/user/self',
-    load
-  );
+  const { data: user } = useSWR('/user/self', load);
 
   return (
     <ContextWrapper user={user}>
@@ -43,7 +40,7 @@ export const LayoutSettings = ({ children }: { children: ReactNode }) => {
               </div>
               <div className="mt-[12px]">Gitroom</div>
             </Link>
-            <TopMenu />
+            {user?.orgId ? <TopMenu /> : <div />}
             <div className="flex items-center gap-[8px]">
               <NotificationComponent />
               <OrganizationSelector />
diff --git a/apps/frontend/src/components/settings/teams.component.tsx b/apps/frontend/src/components/settings/teams.component.tsx
index 3cb8d288..1384a912 100644
--- a/apps/frontend/src/components/settings/teams.component.tsx
+++ b/apps/frontend/src/components/settings/teams.component.tsx
@@ -166,7 +166,6 @@ export const TeamsComponent = () => {
 
   const remove = useCallback(
     (toRemove: { user: { id: string } }) => async () => {
-      console.log(toRemove);
       if (
         !(await deleteDialog(
           'Are you sure you want to remove this team member?'
diff --git a/apps/frontend/src/middleware.ts b/apps/frontend/src/middleware.ts
index c77b6951..0a579fc6 100644
--- a/apps/frontend/src/middleware.ts
+++ b/apps/frontend/src/middleware.ts
@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';
 import { fetchBackend } from '@gitroom/helpers/utils/custom.fetch.func';
-import {removeSubdomain} from "@gitroom/helpers/subdomain/subdomain.management";
+import { removeSubdomain } from '@gitroom/helpers/subdomain/subdomain.management';
 
 // This function can be marked `async` if using `await` inside
 export async function middleware(request: NextRequest) {
@@ -20,7 +20,8 @@ export async function middleware(request: NextRequest) {
       httpOnly: true,
       secure: true,
       maxAge: -1,
-      domain: '.' + new URL(removeSubdomain(process.env.FRONTEND_URL!)).hostname,
+      domain:
+        '.' + new URL(removeSubdomain(process.env.FRONTEND_URL!)).hostname,
     });
     return response;
   }
@@ -46,7 +47,8 @@ export async function middleware(request: NextRequest) {
         httpOnly: true,
         secure: true,
         expires: new Date(Date.now() + 15 * 60 * 1000),
-        domain: '.' + new URL(removeSubdomain(process.env.FRONTEND_URL!)).hostname,
+        domain:
+          '.' + new URL(removeSubdomain(process.env.FRONTEND_URL!)).hostname,
       });
       return redirect;
     }
@@ -77,15 +79,19 @@ export async function middleware(request: NextRequest) {
           httpOnly: true,
           secure: true,
           expires: new Date(Date.now() + 15 * 60 * 1000),
-          domain: '.' + new URL(removeSubdomain(process.env.FRONTEND_URL!)).hostname,
+          domain:
+            '.' + new URL(removeSubdomain(process.env.FRONTEND_URL!)).hostname,
         });
       }
 
       return redirect;
     }
 
-    return NextResponse.next();
+    if (nextUrl.pathname === '/') {
+      return NextResponse.redirect(new URL(`/analytics`, nextUrl.href));
+    }
 
+    return NextResponse.next();
   } catch (err) {
     return NextResponse.redirect(new URL('/auth/logout', nextUrl.href));
   }