diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js
index 8518f1d5..5d832ebb 100644
--- a/DnsServerCore/www/js/main.js
+++ b/DnsServerCore/www/js/main.js
@@ -2871,10 +2871,20 @@ function applyTheme() {
 
     if (currentTheme === "dark")
         document.body.classList.add("dark-mode");
+    else if (currentTheme === "light")
+        document.body.classList.remove("dark-mode");
+    else if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches)
+        document.body.classList.add("dark-mode");
     else
         document.body.classList.remove("dark-mode");
 }
 
+if (window.matchMedia && !localStorage.getItem("theme")) {
+    window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', event => {
+        applyTheme();
+    });
+}
+
 function toggleTheme() {
     document.body.classList.toggle("dark-mode");