diff --git a/superset-frontend/src/embedded/index.tsx b/superset-frontend/src/embedded/index.tsx
index 3cbe3d7408f2..9f9123909cad 100644
--- a/superset-frontend/src/embedded/index.tsx
+++ b/superset-frontend/src/embedded/index.tsx
@@ -91,14 +91,14 @@ const EmbededLazyDashboardPage = () => {
 };
 
 const EmbeddedRoute = () => (
-  <Suspense fallback={<Loading />}>
-    <EmbeddedContextProviders>
+  <EmbeddedContextProviders>
+    <Suspense fallback={<Loading />}>
       <ErrorBoundary>
         <EmbededLazyDashboardPage />
       </ErrorBoundary>
       <ToastContainer position="top" />
-    </EmbeddedContextProviders>
-  </Suspense>
+    </Suspense>
+  </EmbeddedContextProviders>
 );
 
 const EmbeddedApp = () => (