diff --git a/centrifuge-app/src/components/LayoutBase/index.tsx b/centrifuge-app/src/components/LayoutBase/index.tsx
index cd2eca400e..6a69d0e039 100644
--- a/centrifuge-app/src/components/LayoutBase/index.tsx
+++ b/centrifuge-app/src/components/LayoutBase/index.tsx
@@ -4,6 +4,7 @@ import * as React from 'react'
 import { Outlet } from 'react-router'
 import { useIsAboveBreakpoint } from '../../utils/useIsAboveBreakpoint'
 import { Footer } from '../Footer'
+import { LoadBoundary } from '../LoadBoundary'
 import { LogoLink } from '../LogoLink-deprecated'
 import { Menu } from '../Menu'
 import { BasePadding } from './BasePadding'
@@ -57,7 +58,9 @@ export function LayoutBase(): JSX.Element {
       )}
       {/* The ID functions so we can deactive scrolling in certain pages, example in the data page */}
       <ContentWrapper id="content-wrapper">
-        <Outlet />
+        <LoadBoundary>
+          <Outlet />
+        </LoadBoundary>
       </ContentWrapper>
     </Root>
   )
diff --git a/centrifuge-app/src/components/Root.tsx b/centrifuge-app/src/components/Root.tsx
index 2ba8c053c1..338b13ee7f 100644
--- a/centrifuge-app/src/components/Root.tsx
+++ b/centrifuge-app/src/components/Root.tsx
@@ -18,7 +18,6 @@ import { ExpiringCFGRewardsBanner } from './ExpiringCFGRewardsBanner'
 import { GlobalStyle } from './GlobalStyle'
 import { Head } from './Head'
 import { LayoutBase } from './LayoutBase'
-import { LoadBoundary } from './LoadBoundary'
 import { OnboardingAuthProvider } from './OnboardingAuthProvider'
 import { OnboardingProvider } from './OnboardingProvider'
 import { SupportedBrowserBanner } from './SupportedBrowserBanner'
@@ -200,9 +199,7 @@ export function Root() {
                     <ExpiringCFGRewardsBanner />
                     <TransactionProvider>
                       <TransactionToasts />
-                      <LoadBoundary>
-                        <RouterProvider router={router} />
-                      </LoadBoundary>
+                      <RouterProvider router={router} />
                     </TransactionProvider>
                   </DebugFlags>
                 </OnboardingProvider>