diff --git a/public/dashboard/event.html b/public/dashboard/event.html
index aea2b3a..3583bd5 100644
--- a/public/dashboard/event.html
+++ b/public/dashboard/event.html
@@ -756,7 +756,12 @@
       function setupFilters() {
         const dateInput = document.getElementById('filter-date');
         if (dateInput) {
-          dateInput.value = state.date;
+          // Jangan override value yang sudah di-set di DOMContentLoaded
+          // Hanya set jika value masih kosong atau berbeda dengan state.date
+          if (!dateInput.value || dateInput.value !== state.date) {
+            dateInput.value = state.date;
+            dateInput.setAttribute('value', state.date);
+          }
           dateInput.addEventListener('change', () => {
             state.date = dateInput.value || state.date;
             state.page = 1; // Reset to first page
@@ -844,14 +849,18 @@
         console.log('[Events] Default date set to today:', state.date);
         
         // Set dateInput value SECARA LANGSUNG untuk override browser cache/autofill
+        // Lakukan ini SEBELUM setupFilters() untuk memastikan value ter-set dengan benar
         const dateInput = document.getElementById('filter-date');
         if (dateInput) {
+          // Force set value dan attribute untuk override browser cache
           dateInput.value = today;
-          dateInput.setAttribute('value', today); // Force set attribute juga
+          dateInput.setAttribute('value', today);
+          // Juga set property langsung untuk memastikan
+          dateInput.defaultValue = today;
           console.log('[Events] Date input set to:', today, 'actual value:', dateInput.value);
         }
         
-        // Setup filters SETELAH state.date sudah di-set
+        // Setup filters SETELAH state.date dan dateInput.value sudah di-set
         setupFilters();
         await loadLocations();
         await loadGates();
diff --git a/public/dashboard/js/dashboard.js b/public/dashboard/js/dashboard.js
index e0bf6d2..8ce5e6b 100644
--- a/public/dashboard/js/dashboard.js
+++ b/public/dashboard/js/dashboard.js
@@ -681,7 +681,12 @@ function stopVideo() {
 function setupFilters() {
   const dateInput = document.getElementById('filter-date');
   if (dateInput) {
-    dateInput.value = state.date;
+    // Jangan override value yang sudah di-set di DOMContentLoaded
+    // Hanya set jika value masih kosong atau berbeda dengan state.date
+    if (!dateInput.value || dateInput.value !== state.date) {
+      dateInput.value = state.date;
+      dateInput.setAttribute('value', state.date);
+    }
     dateInput.addEventListener('change', () => {
       state.date = dateInput.value || state.date;
       loadSummaryAndCharts();