diff --git a/frontend/src/AppRoutes/index.tsx b/frontend/src/AppRoutes/index.tsx
index ec7db3f0aa..832e557e49 100644
--- a/frontend/src/AppRoutes/index.tsx
+++ b/frontend/src/AppRoutes/index.tsx
@@ -18,9 +18,9 @@ function App(): JSX.Element {
 	return (
 		<ConfigProvider theme={themeConfig}>
 			<NotificationProvider>
-				<QueryBuilderProvider>
-					<Router history={history}>
-						<PrivateRoute>
+				<Router history={history}>
+					<PrivateRoute>
+						<QueryBuilderProvider>
 							<AppLayout>
 								<Suspense fallback={<Spinner size="large" tip="Loading..." />}>
 									<Switch>
@@ -37,9 +37,9 @@ function App(): JSX.Element {
 									</Switch>
 								</Suspense>
 							</AppLayout>
-						</PrivateRoute>
-					</Router>
-				</QueryBuilderProvider>
+						</QueryBuilderProvider>
+					</PrivateRoute>
+				</Router>
 			</NotificationProvider>
 		</ConfigProvider>
 	);