diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index e493cfc5..8441c85f 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -379,9 +379,9 @@ table.dataTable td.wrap {
         var form = document.getElementById("ticketForm"); // your form ID
         var formData = new FormData(form);
 
-        var btn = document.querySelector("button[onclick='submitTicket()']");
-        btn.disabled = true;
-        btn.innerText = "Saving...";
+            var btn = event.target;
+            btn.disabled = true;
+            btn.innerText = "Saving...";
 
         $.ajax({
             url: "<?= base_url('ticketSave') ?>",
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index c7a23bb8..98443f8f 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -533,10 +533,17 @@ hr{
         var form = document.getElementById("ticketForm");
         var id = form.querySelector("[name='thz_id']").value;
         var formData = new FormData(form);
-
+        form.classList.remove('was-validated');
         var btn = document.querySelector("button[onclick='submitTicket()']");
         btn.disabled = true;
         btn.innerText = "Saving...";
+
+        var ticketType = document.getElementById('ticket_type').value.trim();
+        if (ticketType === "") {
+            toastr.warning('Please fill all required fields.', 'Warning');
+            form.classList.add('was-validated');
+            return;
+        }
     
         $.ajax({
             url: "<?= base_url('ticketSave') ?>",