diff --git a/src/pages/DAOController.tsx b/src/pages/DAOController.tsx
index bcf37ebe6c..50e41d5421 100644
--- a/src/pages/DAOController.tsx
+++ b/src/pages/DAOController.tsx
@@ -2,6 +2,7 @@ import { Button, Center, Text, VStack, ChakraProvider, extendTheme } from '@chak
 import { theme } from '@decent-org/fractal-ui';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { Outlet } from 'react-router-dom';
 import useDAOController from '../hooks/DAO/useDAOController';
 import useDAOMetadata from '../hooks/DAO/useDAOMetadata';
 import { useFractal } from '../providers/App/AppProvider';
@@ -31,7 +32,7 @@ function InvalidSafe() {
   );
 }
 
-export default function DAOController({ children }: { children: React.ReactNode }) {
+export default function DAOController() {
   const { node } = useFractal();
   const { nodeLoading, errorLoading } = useDAOController();
   const daoMetadata = useDAOMetadata();
@@ -62,9 +63,13 @@ export default function DAOController({ children }: { children: React.ReactNode
   let display;
 
   if (import.meta.env.VITE_APP_TESTING_ENVIRONMENT) {
-    display = <ChakraProvider theme={activeTheme}>{children}</ChakraProvider>;
+    display = (
+      <ChakraProvider theme={activeTheme}>
+        <Outlet />
+      </ChakraProvider>
+    );
   } else if (nodeLoading || validSafe || !errorLoading) {
-    display = <>{children}</>;
+    display = <Outlet />;
   } else {
     display = <InvalidSafe />;
   }
diff --git a/src/router.tsx b/src/router.tsx
index 3897d8b602..79c0f4dd29 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -25,9 +25,7 @@ export const router = createBrowserRouter([
       // within underlying modals. Otherwise - trying to invoke routing-related hooks would lead to crash.
       // Not the best place to have this provider here but also more reasonalbe than putting that into <Layout />
       <ModalProvider>
-        <DAOController>
-          <Layout />
-        </DAOController>
+        <Layout />
       </ModalProvider>
     ),
     children: [
@@ -40,59 +38,65 @@ export const router = createBrowserRouter([
         element: <DaoCreatePage />,
       },
       {
-        path: 'home',
-        element: <DaoDashboardPage />,
-      },
-      {
-        path: 'edit/governance',
-        element: <ModifyGovernancePage />,
-      },
-      {
-        path: 'hierarchy',
-        element: <HierarchyPage />,
-      },
-      {
-        path: 'new',
-        element: <SubDaoCreate />,
-      },
-      {
-        path: 'proposal-templates',
+        path: '/',
+        element: <DAOController />,
         children: [
           {
-            index: true,
-            element: <ProposalTemplatesPage />,
+            path: 'home',
+            element: <DaoDashboardPage />,
+          },
+          {
+            path: 'edit/governance',
+            element: <ModifyGovernancePage />,
+          },
+          {
+            path: 'hierarchy',
+            element: <HierarchyPage />,
           },
           {
             path: 'new',
-            element: <CreateProposalTemplatePage />,
+            element: <SubDaoCreate />,
           },
-        ],
-      },
-      {
-        path: 'proposals',
-        children: [
           {
-            index: true,
-            element: <ProposalsPage />,
+            path: 'proposal-templates',
+            children: [
+              {
+                index: true,
+                element: <ProposalTemplatesPage />,
+              },
+              {
+                path: 'new',
+                element: <CreateProposalTemplatePage />,
+              },
+            ],
           },
           {
-            path: ':proposalId',
-            element: <ProposalDetailsPage />,
+            path: 'proposals',
+            children: [
+              {
+                index: true,
+                element: <ProposalsPage />,
+              },
+              {
+                path: ':proposalId',
+                element: <ProposalDetailsPage />,
+              },
+              {
+                path: 'new',
+                element: <ProposalCreatePage />,
+              },
+            ],
           },
           {
-            path: 'new',
-            element: <ProposalCreatePage />,
+            path: 'settings',
+            element: <SettingsPage />,
+          },
+          {
+            path: 'treasury',
+            element: <Treasury />,
           },
         ],
       },
-      {
-        path: 'settings',
-        element: <SettingsPage />,
-      },
-      {
-        path: 'treasury',
-        element: <Treasury />,
-      },
       {
         // this exists to keep old links working
         // /daos/0x0123/* will redirect to /home?dao=0x0123