diff --git a/apps/theme-builder/src/app.tsx b/apps/theme-builder/src/app.tsx
index 8a4a8d4b8..bfebff901 100644
--- a/apps/theme-builder/src/app.tsx
+++ b/apps/theme-builder/src/app.tsx
@@ -37,6 +37,7 @@ export function App() {
     (async () => {
       try {
         setIsLoading(true);
+        await useStore.getState().init();
         const theme = from_pr
           ? await loadThemeFromPullRequest(from_pr)
           : from_url
diff --git a/apps/web/src/components/theme-provider/index.tsx b/apps/web/src/components/theme-provider/index.tsx
index 2056acb25..9218ece8b 100644
--- a/apps/web/src/components/theme-provider/index.tsx
+++ b/apps/web/src/components/theme-provider/index.tsx
@@ -51,6 +51,7 @@ export function BaseThemeProvider(
   const cssTheme = useMemo(() => themeToCSS(theme), [theme]);
 
   useEffect(() => {
+    if (IS_THEME_BUILDER) return;
     (async () => {
       await useThemeStore.getState().init();
     })();