diff --git a/frontend/src/component/App.tsx b/frontend/src/component/App.tsx
index 8f8fef5220..65a50202c2 100644
--- a/frontend/src/component/App.tsx
+++ b/frontend/src/component/App.tsx
@@ -48,61 +48,67 @@ export const App = () => {
 
     return (
         <ErrorBoundary FallbackComponent={Error}>
-            <SWRProvider>
-                <Suspense fallback={<Loader />}>
-                    <PlausibleProvider>
-                        <ConditionallyRender
-                            condition={!hasFetchedAuth}
-                            show={<Loader />}
-                            elseShow={
-                                <>
-                                    <ConditionallyRender
-                                        condition={Boolean(
-                                            uiConfig?.maintenanceMode
-                                        )}
-                                        show={<MaintenanceBanner />}
-                                    />
-                                    <StyledContainer>
-                                        <ToastRenderer />
-                                        <Routes>
-                                            {availableRoutes.map(route => (
+            <PlausibleProvider>
+                <ErrorBoundary FallbackComponent={Error}>
+                    <SWRProvider>
+                        <Suspense fallback={<Loader />}>
+                            <ConditionallyRender
+                                condition={!hasFetchedAuth}
+                                show={<Loader />}
+                                elseShow={
+                                    <>
+                                        <ConditionallyRender
+                                            condition={Boolean(
+                                                uiConfig?.maintenanceMode
+                                            )}
+                                            show={<MaintenanceBanner />}
+                                        />
+                                        <StyledContainer>
+                                            <ToastRenderer />
+                                            <Routes>
+                                                {availableRoutes.map(route => (
+                                                    <Route
+                                                        key={route.path}
+                                                        path={route.path}
+                                                        element={
+                                                            <LayoutPicker
+                                                                isStandalone={
+                                                                    route.isStandalone ===
+                                                                    true
+                                                                }
+                                                            >
+                                                                <ProtectedRoute
+                                                                    route={
+                                                                        route
+                                                                    }
+                                                                />
+                                                            </LayoutPicker>
+                                                        }
+                                                    />
+                                                ))}
                                                 <Route
-                                                    key={route.path}
-                                                    path={route.path}
+                                                    path="/"
                                                     element={
-                                                        <LayoutPicker
-                                                            isStandalone={
-                                                                route.isStandalone ===
-                                                                true
-                                                            }
-                                                        >
-                                                            <ProtectedRoute
-                                                                route={route}
-                                                            />
-                                                        </LayoutPicker>
+                                                        <InitialRedirect />
                                                     }
                                                 />
-                                            ))}
-                                            <Route
-                                                path="/"
-                                                element={<InitialRedirect />}
-                                            />
-                                            <Route
-                                                path="*"
-                                                element={<NotFound />}
-                                            />
-                                        </Routes>
+                                                <Route
+                                                    path="*"
+                                                    element={<NotFound />}
+                                                />
+                                            </Routes>
 
-                                        <FeedbackNPS openUrl="http://feedback.unleash.run" />
+                                            <FeedbackNPS openUrl="http://feedback.unleash.run" />
 
-                                        <SplashPageRedirect />
-                                    </StyledContainer>
-                                </>
-                            }
-                        />
-                    </PlausibleProvider>
-                </Suspense>
-            </SWRProvider>
+                                            <SplashPageRedirect />
+                                        </StyledContainer>
+                                    </>
+                                }
+                            />
+                        </Suspense>
+                    </SWRProvider>
+                </ErrorBoundary>
+            </PlausibleProvider>
         </ErrorBoundary>
     );
 };