diff --git a/public/dashboard/settings.html b/public/dashboard/settings.html
index ffb479d..b447328 100644
--- a/public/dashboard/settings.html
+++ b/public/dashboard/settings.html
@@ -582,10 +582,27 @@
         }
       }
 
-      // Logout handler
-      document.getElementById('logout-button')?.addEventListener('click', () => {
-        Auth.logout();
-      });
+      // Logout handler - pastikan ter-attach dengan benar
+      function setupLogoutButton() {
+        const logoutBtn = document.getElementById('logout-button');
+        if (logoutBtn) {
+          console.log('[Settings] Logout button found, attaching event listener');
+          logoutBtn.addEventListener('click', (e) => {
+            e.preventDefault();
+            console.log('[Settings] Logout button clicked');
+            Auth.logout();
+          });
+        } else {
+          console.warn('[Settings] Logout button not found!');
+        }
+      }
+      
+      // Setup saat DOM ready
+      if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', setupLogoutButton);
+      } else {
+        setupLogoutButton();
+      }
 
       // Helper untuk build query string
       function buildQuery(params = {}) {