diff --git a/scripts/pi-hole/js/db_graph.js b/scripts/pi-hole/js/db_graph.js
index 67ed32fb8..4ca0fb6b8 100644
--- a/scripts/pi-hole/js/db_graph.js
+++ b/scripts/pi-hole/js/db_graph.js
@@ -240,7 +240,8 @@ $(function () {
         tooltip: {
           enabled: true,
           yAlign: "bottom",
-          mode: "index",
+          intersect: false,
+          mode: "x",
           itemSort: function (a, b) {
             return b.datasetIndex - a.datasetIndex;
           },
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 292cd36be..c1cde2bba 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -861,7 +861,8 @@ $(function () {
         },
         tooltip: {
           enabled: true,
-          mode: "index",
+          intersect: false,
+          mode: "x",
           yAlign: "bottom",
           itemSort: function (a, b) {
             return b.datasetIndex - a.datasetIndex;
@@ -969,7 +970,8 @@ $(function () {
           tooltip: {
             // Disable the on-canvas tooltip
             enabled: false,
-            mode: "index",
+            intersect: false,
+            mode: "x",
             external: customTooltips,
             yAlign: "top",
             itemSort: function (a, b) {