diff --git a/lib/assets/javascripts/color_mode_picker.js b/lib/assets/javascripts/color_mode_picker.js
index 74674877..b6e6ab21 100644
--- a/lib/assets/javascripts/color_mode_picker.js
+++ b/lib/assets/javascripts/color_mode_picker.js
@@ -37,10 +37,11 @@ const setTheme = theme => {
     })
     document.dispatchEvent(event)
     document.documentElement.setAttribute('data-bs-theme', currentTheme)
+    return currentTheme;
 }
 
 window.getCurrentTheme = () => {
-    return document.documentElement.getAttribute('data-bs-theme');
+    return document.documentElement.getAttribute('data-bs-theme') || setTheme(getPreferredTheme());
 }
 
 const showActiveTheme = (theme, focus = false) => {