diff --git a/app/index.js b/app/index.js
index 4a6b63b98..0255f8628 100644
--- a/app/index.js
+++ b/app/index.js
@@ -22,9 +22,9 @@ const element = document.getElementById("root");
 
 if (element) {
   render(
-    <ErrorBoundary>
-      <Provider {...stores}>
-        <Theme>
+    <Provider {...stores}>
+      <Theme>
+        <ErrorBoundary>
           <DndProvider backend={HTML5Backend}>
             <Router>
               <>
@@ -35,9 +35,9 @@ if (element) {
               </>
             </Router>
           </DndProvider>
-        </Theme>
-      </Provider>
-    </ErrorBoundary>,
+        </ErrorBoundary>
+      </Theme>
+    </Provider>,
     element
   );
 }