diff --git a/assets/js/theme.js b/assets/js/theme.js
index be17dc90..079c0906 100644
--- a/assets/js/theme.js
+++ b/assets/js/theme.js
@@ -1,8 +1,11 @@
-// for now this is assuming default theme is set to dark
-// will probably refactor in the future for much better handling
 function loadPreferredTheme() {
-    if (localStorage.getItem("pref-theme") === "light") {
+    const preferredTheme = localStorage.getItem("pref-theme");
+    const isDarkTheme = document.body.classList.contains("dark");
+
+    if (preferredTheme === "light" && isDarkTheme) {
         document.body.classList.remove('dark')
+    } else if (preferredTheme === "dark" && !isDarkTheme) {
+        document.body.classList.add('dark')
     }
 }