diff --git a/ui/src/App.tsx b/ui/src/App.tsx
index 90ac86b..b4bf30c 100644
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@ -68,16 +68,15 @@ export const App = () => {
 
                 <Route
                   element={
-                    <>
-                      <ProtectedRoute
-                        fallback="/login"
-                        shouldRedirectToCurrentPage
-                      />
-                      <Layout />
-                    </>
+                    <ProtectedRoute
+                      fallback="/login"
+                      shouldRedirectToCurrentPage
+                    />
                   }
                 >
-                  <Route path="join/:tablo_name" element={<JoinPage />} />
+                  <Route element={<Layout />}>
+                    <Route path="join/:tablo_name" element={<JoinPage />} />
+                  </Route>
                 </Route>
                 <Route path="login-with-oauth" element={<OAuthSigninPage />} />
                 <Route path="landing" element={<LandingPage />} />