diff --git a/scripts/pi-hole/js/customcname.js b/scripts/pi-hole/js/customcname.js
index 10ebfe3b..f495abc1 100644
--- a/scripts/pi-hole/js/customcname.js
+++ b/scripts/pi-hole/js/customcname.js
@@ -71,6 +71,7 @@ $(function () {
     ],
     order: [[0, "asc"]],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("LocalCNAMETable", data);
     },
diff --git a/scripts/pi-hole/js/customdns.js b/scripts/pi-hole/js/customdns.js
index 655357ff..ba1335e0 100644
--- a/scripts/pi-hole/js/customdns.js
+++ b/scripts/pi-hole/js/customdns.js
@@ -71,6 +71,7 @@ $(function () {
     ],
     order: [[0, "asc"]],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("LocalDNSTable", data);
     },
diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index b8af5b4f..1e6ba131 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -289,17 +289,13 @@ function initTable() {
       [10, 25, 50, 100, "All"],
     ],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("groups-adlists-table", data);
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-adlists-table");
 
-      // Return if not available
-      if (data === null) {
-        return null;
-      }
-
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js
index 268017d5..c7d6c897 100644
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
@@ -217,17 +217,13 @@ function initTable() {
       [10, 25, 50, 100, "All"],
     ],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("groups-clients-table", data);
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-clients-table");
 
-      // Return if not available
-      if (data === null) {
-        return null;
-      }
-
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 0eb1bb6f..818f5ded 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -246,17 +246,13 @@ function initTable() {
       [10, 25, 50, 100, "All"],
     ],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("groups-domains-table", data);
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-domains-table");
 
-      // Return if not available
-      if (data === null) {
-        return null;
-      }
-
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Show group assignment column only on full page
diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js
index cdd621a1..d8e274f6 100644
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
@@ -86,17 +86,13 @@ $(function () {
       [10, 25, 50, 100, "All"],
     ],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("groups-table", data);
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-table");
 
-      // Return if not available
-      if (data === null) {
-        return null;
-      }
-
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index 1d72bb95..e30d26df 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -141,15 +141,12 @@ $(function () {
       emptyTable: "No issues found.",
     },
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("messages-table", data);
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("messages-table");
-      // Return if not available
-      if (data === null) {
-        return null;
-      }
 
       // Reset visibility of ID and blob columns
       var hiddenCols = [0, 4, 5, 6, 7, 8];
diff --git a/scripts/pi-hole/js/network.js b/scripts/pi-hole/js/network.js
index f68b16b3..e2cce194 100644
--- a/scripts/pi-hole/js/network.js
+++ b/scripts/pi-hole/js/network.js
@@ -276,6 +276,7 @@ $(function () {
       [10, 25, 50, 100, "All"],
     ],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("network_table", data);
     },
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 94e6e508..22de7a08 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -334,6 +334,7 @@ $(function () {
       [10, 25, 50, 100, "All"],
     ],
     stateSave: true,
+    stateDuration: 0,
     stateSaveCallback: function (settings, data) {
       utils.stateSaveCallback("query_log_table", data);
     },
diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index 7ff30379..badf92f3 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -223,6 +223,7 @@ $(function () {
       scrollX: true,
       order: [[2, "asc"]],
       stateSave: true,
+      stateDuration: 0,
       stateSaveCallback: function (settings, data) {
         utils.stateSaveCallback("activeDhcpLeaseTable", data);
       },