diff --git a/packages/webawesome/docs/_includes/color-scheme-selector.njk b/packages/webawesome/docs/_includes/color-scheme-selector.njk
index 51e6eb99d..d2c156218 100644
--- a/packages/webawesome/docs/_includes/color-scheme-selector.njk
+++ b/packages/webawesome/docs/_includes/color-scheme-selector.njk
@@ -16,3 +16,10 @@
     System
   </wa-option>
 </wa-select>
+
+<script>
+  // Immediately set the correct value from storage
+  document.querySelectorAll('wa-select.color-scheme-selector').forEach(el => {
+    el.setAttribute('value', localStorage.getItem('color-scheme') || 'auto');
+  });
+</script>
diff --git a/packages/webawesome/docs/_includes/theme-selector.njk b/packages/webawesome/docs/_includes/theme-selector.njk
index 2fcf7df3a..fcb95712d 100644
--- a/packages/webawesome/docs/_includes/theme-selector.njk
+++ b/packages/webawesome/docs/_includes/theme-selector.njk
@@ -16,3 +16,10 @@
     {% endif %}
   {% endfor %}
 </wa-select>
+
+<script>
+  // Immediately set the correct value from storage
+  document.querySelectorAll('wa-select.theme-selector').forEach(el => {
+    el.setAttribute('value', localStorage.getItem('theme') || 'default');
+  });
+</script>