diff --git a/data/web/js/build/015-mailcow.js b/data/web/js/build/015-mailcow.js
index 351b794c..2d7f9d82 100644
--- a/data/web/js/build/015-mailcow.js
+++ b/data/web/js/build/015-mailcow.js
@@ -304,13 +304,13 @@ $(document).ready(function() {
       $('#dark-mode-toggle').prop('checked', false);
       if ($('#rspamd_logo').length) $('#rspamd_logo').attr('src', '/img/rspamd_logo_dark.png');
       if ($('#rspamd_logo_sm').length) $('#rspamd_logo_sm').attr('src', '/img/rspamd_logo_dark.png');
-      localStorage.setItem('darkmode', 'false');
+      localStorage.setItem('theme', 'light');
     }else{
       $('head').append('<link id="dark-mode-theme" rel="stylesheet" type="text/css" href="/css/themes/mailcow-darkmode.css">');
       $('#dark-mode-toggle').prop('checked', true);
       if ($('#rspamd_logo').length) $('#rspamd_logo').attr('src', '/img/rspamd_logo_light.png');
       if ($('#rspamd_logo_sm').length) $('#rspamd_logo_sm').attr('src', '/img/rspamd_logo_light.png');
-      localStorage.setItem('darkmode', 'true');
+      localStorage.setItem('theme', 'dark');
     }
   }
 });
diff --git a/data/web/js/site/index.js b/data/web/js/site/index.js
index cbbb1a44..4c812a37 100644
--- a/data/web/js/site/index.js
+++ b/data/web/js/site/index.js
@@ -1,5 +1,5 @@
 $(document).ready(function() {
-  var darkmode = localStorage.getItem("darkmode");
+  var theme = localStorage.getItem("theme");
   localStorage.clear();
-  localStorage.setItem("darkmode", darkmode);
+  localStorage.setItem("theme", theme);
 });
diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig
index 83860ad0..743a2b2d 100644
--- a/data/web/templates/base.twig
+++ b/data/web/templates/base.twig
@@ -11,8 +11,8 @@
   <link rel="stylesheet" href="{{ css_path }}">
   <script>
     // check if darkmode is preferred by OS or set by localStorage
-    if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ||
-        JSON.parse(localStorage.getItem("darkmode")) === true) {
+    if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches && localStorage.getItem("theme") !== "light" ||
+        localStorage.getItem("theme") === "dark") {
       var head  = document.getElementsByTagName('head')[0];
       var link  = document.createElement('link');
       link.id   = 'dark-mode-theme';