diff --git a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
index 5b066b468..98e2da238 100644
--- a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
+++ b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
@@ -19,9 +19,6 @@ class CheckoutActionHandler {
             const errorHandler = this.errorHandler;
 
             const formSelector = this.config.context === 'checkout' ? 'form.checkout' : 'form#order_review';
-            spinner.setTarget(formSelector);
-            spinner.block();
-
             const formValues = jQuery(formSelector).serialize();
 
             return fetch(this.config.ajax.create_order.endpoint, {
@@ -53,13 +50,10 @@ class CheckoutActionHandler {
         return {
             createOrder,
             onApprove:onApprove(this, this.errorHandler, this.spinner),
-            onClick: () => {
-                spinner.unblock();
-            },
             onCancel: () => {
                 spinner.unblock();
             },
-            onError: (error) => {
+            onError: () => {
                 this.errorHandler.genericError();
                 spinner.unblock();
             }