diff --git a/modules/ppcp-order-tracking/resources/js/order-edit-page.js b/modules/ppcp-order-tracking/resources/js/order-edit-page.js
index 22ed1fd57..af86bf53e 100644
--- a/modules/ppcp-order-tracking/resources/js/order-edit-page.js
+++ b/modules/ppcp-order-tracking/resources/js/order-edit-page.js
@@ -32,6 +32,9 @@ document.addEventListener(
                 return res.json();
             }).then(function (data) {
                 if (!data.success) {
+                    jQuery( "<span class='error tracking-info-message'>" + data.data.message + "</span>" ).insertAfter(submitButton);
+                    setTimeout(()=> jQuery('.tracking-info-message').remove(),3000);
+                    submitButton.removeAttribute('disabled');
                     console.error(data);
                     throw Error(data.data.message);
                 }
diff --git a/modules/ppcp-order-tracking/src/Endpoint/OrderTrackingEndpoint.php b/modules/ppcp-order-tracking/src/Endpoint/OrderTrackingEndpoint.php
index 33283f685..c4e80bb02 100644
--- a/modules/ppcp-order-tracking/src/Endpoint/OrderTrackingEndpoint.php
+++ b/modules/ppcp-order-tracking/src/Endpoint/OrderTrackingEndpoint.php
@@ -101,7 +101,7 @@ class OrderTrackingEndpoint {
 
 			wp_send_json_success( array( 'message' => $message ) );
 		} catch ( Exception $error ) {
-			wp_send_json_error( $error->getMessage(), 500 );
+			wp_send_json_error( array( 'message' => $error->getMessage() ), 500 );
 		}
 	}