diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index a5e6883e..11446515 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -1181,7 +1181,6 @@ class JobOrderController extends Controller
     // ajax call
     public function cancelReasons()
     { 
-        error_log('start cancel_reasons');
         return $this->json([
             'cancel_reasons' => JOCancelReasons::getCollection(),
         ]);
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 25027fdc..d94b1305 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -1764,30 +1764,32 @@ $(function() {
                 inputOptions: inputOptionsPromise,  
                 type: 'warning',
                 showCancelButton: true,
+                closeOnCancel: true,
                 width: '40rem',
                 inputValidator: (value) => {
                     return new Promise((resolve) => {
-                        console.log(value)
                         resolve()
                     })
                 }
             }).then((result) => {
-                $.ajax({
-                    method: "DELETE",
-                    url: url,
-                    data: {
-                        'cancel_reason': result.value
-                    }
-                }).done(function(response) {
-                    swal({
-                        title: 'Done!',
-                        text: response.success,
-                        type: 'success',
-                        onClose: function() {
-                            window.location.href = "{{ return_url }}";
+                if (result.value) {
+                    $.ajax({
+                        method: "DELETE",
+                        url: url,
+                        data: {
+                            'cancel_reason': result.value
                         }
+                    }).done(function(response) {
+                        swal({
+                            title: 'Done!',
+                            text: response.success,
+                            type: 'success',
+                            onClose: function() {
+                                window.location.href = "{{ return_url }}";
+                            }
+                        });
                     });
-                });
+                } 
             });
         });