diff --git a/apps/desktop/index.html b/apps/desktop/index.html
index 6531bb92ec..91a82d9c15 100644
--- a/apps/desktop/index.html
+++ b/apps/desktop/index.html
@@ -16,6 +16,9 @@
 <body data-theme="default">
   <div id="root"></div>
   <script type="module" src="/src/main.tsx"></script>
+  <script>
+    document.body.dataset['theme'] = localStorage.getItem('theme');
+  </script>
 </body>
 
 </html>
diff --git a/apps/desktop/src/App.tsx b/apps/desktop/src/App.tsx
index a8716ed0f5..91037a23cc 100644
--- a/apps/desktop/src/App.tsx
+++ b/apps/desktop/src/App.tsx
@@ -212,7 +212,9 @@ function App() {
       <TextSearch contentRoot={contentContainer.current} />
       <div ref={contentContainer}>
         <BrowserRouter>
-          <ClientApp deviceContextValue={deviceContextValue} />
+          {!shouldShowSplashScreen && (
+            <ClientApp deviceContextValue={deviceContextValue} />
+          )}
         </BrowserRouter>
       </div>
     </LocaleContext.Provider>
