diff --git a/src/renderer/features/titlebar/components/title-bar.tsx b/src/renderer/features/titlebar/components/titlebar.tsx
similarity index 100%
rename from src/renderer/features/titlebar/components/title-bar.tsx
rename to src/renderer/features/titlebar/components/titlebar.tsx
diff --git a/src/renderer/router/private-outlet.tsx b/src/renderer/router/app-outlet.tsx
similarity index 75%
rename from src/renderer/router/private-outlet.tsx
rename to src/renderer/router/app-outlet.tsx
index ba9edff60..1f438f6f2 100644
--- a/src/renderer/router/private-outlet.tsx
+++ b/src/renderer/router/app-outlet.tsx
@@ -5,13 +5,15 @@ interface PrivateOutletProps {
   redirectTo: string;
 }
 
-export const PrivateOutlet = ({ redirectTo }: PrivateOutletProps) => {
+export const AppOutlet = ({ redirectTo }: PrivateOutletProps) => {
   const location = useLocation();
   const isAuthenticated = useAuthStore((state) => !!state.accessToken);
+  const logout = useAuthStore((state) => state.logout);
 
   if (isAuthenticated) {
     return <Outlet />;
   }
 
+  logout();
   return <Navigate replace state={{ from: location }} to={redirectTo} />;
 };
diff --git a/src/renderer/router/app-router.tsx b/src/renderer/router/app-router.tsx
index 240b5d5f9..0f16118b7 100644
--- a/src/renderer/router/app-router.tsx
+++ b/src/renderer/router/app-router.tsx
@@ -1,12 +1,12 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
-import { Routes, Route } from 'react-router-dom';
+import { Routes, Route, Link } from 'react-router-dom';
 import { AlbumListRoute } from '@/renderer/features/albums';
 import { LoginRoute } from '@/renderer/features/auth';
 import { DashboardRoute } from '@/renderer/features/dashboard';
 import { NowPlayingRoute } from '@/renderer/features/now-playing';
 import { AuthLayout, DefaultLayout } from '@/renderer/layouts';
+import { AppOutlet } from '@/renderer/router/app-outlet';
 import { AuthOutlet } from '@/renderer/router/auth-outlet';
-import { PrivateOutlet } from '@/renderer/router/private-outlet';
 import { AppRoute } from './routes';
 
 export const AppRouter = () => {
@@ -17,15 +17,14 @@ export const AppRouter = () => {
           <Route element={<LoginRoute />} path={AppRoute.LOGIN} />
         </Route>
       </Route>
-      <Route
-        element={<PrivateOutlet redirectTo={AppRoute.LOGIN} />}
-        path={AppRoute.HOME}
-      >
+      <Route element={<AppOutlet redirectTo={AppRoute.LOGIN} />}>
         <Route element={<DefaultLayout />}>
+          <Route index element={<DashboardRoute />} />
           <Route element={<DashboardRoute />} path={AppRoute.HOME} />
           <Route element={<NowPlayingRoute />} path={AppRoute.NOW_PLAYING} />
           <Route element={<AlbumListRoute />} path={AppRoute.LIBRARY_ALBUMS} />
           <Route element={<></>} path={AppRoute.LIBRARY_ARTISTS} />
+          <Route element={<Link to={AppRoute.HOME}>Go home</Link>} path="*" />
         </Route>
         <Route element={<></>} path={AppRoute.PLAYING} />
       </Route>