diff --git a/sites/shared/components/workbench/index.mjs b/sites/shared/components/workbench/index.mjs
index e5bff615bba..54ec9f602d1 100644
--- a/sites/shared/components/workbench/index.mjs
+++ b/sites/shared/components/workbench/index.mjs
@@ -2,6 +2,7 @@
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'next-i18next'
 import { useView } from 'shared/hooks/use-view.mjs'
+import { usePatternSettings } from 'shared/hooks/use-pattern-settings.mjs'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useControlState } from 'shared/components/account/control.mjs'
 // Dependencies
@@ -65,14 +66,21 @@ export const Workbench = ({ design, Design, baseSettings, DynamicDocs, from }) =
 
   // State
   const [view, setView] = useView()
-  const [settings, setSettings] = useState({ ...baseSettings, embed: true })
+  const [settings, setSettings] = usePatternSettings()
   const [ui, setUi] = useState(defaultUi)
   const [error, setError] = useState(false)
+  const [mounted, setMounted] = useState(false)
 
   // Effect
   useEffect(() => {
-    // Force re-render when baseSettings changes. Required when they are loaded async.
-    setSettings({ ...baseSettings, embed: true })
+    /*
+     * baseSettings can be loaded async.
+     * So we need be careful when to trust the state in the URL or when to use the one from props.
+     */
+    if (!mounted && !settings && baseSettings) {
+      setMounted(true)
+      setSettings({ ...baseSettings, embed: true })
+    }
   }, [baseSettings])
 
   // Helper methods for settings/ui updates
diff --git a/sites/shared/hooks/use-pattern-settings.mjs b/sites/shared/hooks/use-pattern-settings.mjs
new file mode 100644
index 00000000000..2283ba0cb93
--- /dev/null
+++ b/sites/shared/hooks/use-pattern-settings.mjs
@@ -0,0 +1,6 @@
+import { useAtom } from 'jotai'
+import { atomWithHash } from 'jotai-location'
+
+const baseSettings = atomWithHash('settings', false, { delayInit: true })
+
+export const usePatternSettings = () => useAtom(baseSettings)