diff --git a/src/components/App.tsx b/src/components/App.tsx
index aca132dc0d6ea3cf4056c4b436fc5d548ea1674e..d8bead7a21c094115910faa4312a0a9fb2a0b478 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1,4 +1,3 @@
-import { ThemeProvider } from '@material-ui/core'
 import Navbar from 'components/Navbar/Navbar'
 import AppRoutes from 'components/Routes/Routes'
 import SplashRoot from 'components/Splash/SplashRoot'
@@ -10,7 +9,6 @@ import React, { useEffect } from 'react'
 import { useLocation } from 'react-router-dom'
 import { useAppSelector } from 'store/hooks'
 import MatomoTracker from 'utils/matomoTracker'
-import { theme } from './theme'
 import usePageTitle from './Hooks/usePageTitle'
 
 interface AppProps {
@@ -41,20 +39,18 @@ export const App = ({ tracker }: AppProps) => {
 
   return (
     <Layout>
-      <ThemeProvider theme={theme}>
-        <SplashRoot>
-          {termsStatus.accepted && (
-            <>
-              <WelcomeModal open={!onboarding.isWelcomeSeen} />
-              <Navbar />
-            </>
-          )}
-          <main className="app-content">
-            <AppRoutes termsStatus={termsStatus} />
-          </main>
-        </SplashRoot>
-        {process.env.NODE_ENV !== 'production' ? <CozyDevtools /> : null}
-      </ThemeProvider>
+      <SplashRoot>
+        {termsStatus.accepted && (
+          <>
+            <WelcomeModal open={!onboarding.isWelcomeSeen} />
+            <Navbar />
+          </>
+        )}
+        <main className="app-content">
+          <AppRoutes termsStatus={termsStatus} />
+        </main>
+      </SplashRoot>
+      {process.env.NODE_ENV !== 'production' ? <CozyDevtools /> : null}
     </Layout>
   )
 }
diff --git a/src/targets/browser/index.tsx b/src/targets/browser/index.tsx
index 9e9cde5363be93509e43daa58fc5576d2d344c6a..5ebc9a37ad05dbe2da2a668c4c961792463f9038 100644
--- a/src/targets/browser/index.tsx
+++ b/src/targets/browser/index.tsx
@@ -5,8 +5,10 @@ declare let __PIWIK_SITEID__: number
 declare let __SENTRY_DSN__: string
 declare let Piwik: any
 
+import { ThemeProvider } from '@material-ui/core'
 import * as Sentry from '@sentry/react'
 import { BrowserTracing } from '@sentry/tracing'
+import { theme } from 'components/theme'
 import CozyClient, { Client, CozyProvider } from 'cozy-client'
 import { isFlagshipApp } from 'cozy-device-helper'
 import { handleOAuthResponse } from 'cozy-harvest-lib/dist/helpers/oauth'
@@ -109,7 +111,9 @@ const init = () => {
         <CozyProvider client={client}>
           <I18n lang={locale} polyglot={polyglot}>
             <HashRouter {...history}>
-              <App tracker={tracker} />
+              <ThemeProvider theme={theme}>
+                <App tracker={tracker} />
+              </ThemeProvider>
             </HashRouter>
           </I18n>
         </CozyProvider>