diff --git a/scripts/pi-hole/js/debug.js b/scripts/pi-hole/js/debug.js
index bf5609d1..dba012f4 100644
--- a/scripts/pi-hole/js/debug.js
+++ b/scripts/pi-hole/js/debug.js
@@ -55,7 +55,7 @@ function eventsource() {
 }
 
 $("#debugBtn").on("click", function () {
-  $("#debugBtn").attr("disabled", true);
-  $("#upload").attr("disabled", true);
+  $("#debugBtn").prop("disabled", true);
+  $("#upload").prop("disabled", true);
   eventsource();
 });
diff --git a/scripts/pi-hole/js/gravity.js b/scripts/pi-hole/js/gravity.js
index 04d08619..3d52390f 100644
--- a/scripts/pi-hole/js/gravity.js
+++ b/scripts/pi-hole/js/gravity.js
@@ -60,7 +60,7 @@ function eventsource() {
 }
 
 $("#gravityBtn").on("click", function () {
-  $("#gravityBtn").attr("disabled", true);
+  $("#gravityBtn").prop("disabled", true);
   eventsource();
 });
 
@@ -76,7 +76,7 @@ $(function () {
   // gravity.php?go
   var searchString = window.location.search.substring(1);
   if (searchString.indexOf("go") !== -1) {
-    $("#gravityBtn").attr("disabled", true);
+    $("#gravityBtn").prop("disabled", true);
     eventsource();
   }
 });
diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js
index fd03d70c..62deb504 100644
--- a/scripts/pi-hole/js/utils.js
+++ b/scripts/pi-hole/js/utils.js
@@ -109,22 +109,22 @@ function datetime(date) {
 }
 
 function disableAll() {
-  $("input").attr("disabled", true);
-  $("select").attr("disabled", true);
-  $("button").attr("disabled", true);
-  $("textarea").attr("disabled", true);
+  $("input").prop("disabled", true);
+  $("select").prop("disabled", true);
+  $("button").prop("disabled", true);
+  $("textarea").prop("disabled", true);
 }
 
 function enableAll() {
-  $("input").attr("disabled", false);
-  $("select").attr("disabled", false);
-  $("button").attr("disabled", false);
-  $("textarea").attr("disabled", false);
+  $("input").prop("disabled", false);
+  $("select").prop("disabled", false);
+  $("button").prop("disabled", false);
+  $("textarea").prop("disabled", false);
 
   // Enable custom input field only if applicable
   var ip = $("#select") ? $("#select").val() : null;
   if (ip !== null && ip !== "custom") {
-    $("#ip-custom").attr("disabled", true);
+    $("#ip-custom").prop("disabled", true);
   }
 }