diff --git a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
index 4af23327a..5b066b468 100644
--- a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
+++ b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
@@ -53,8 +53,15 @@ class CheckoutActionHandler {
         return {
             createOrder,
             onApprove:onApprove(this, this.errorHandler, this.spinner),
+            onClick: () => {
+                spinner.unblock();
+            },
+            onCancel: () => {
+                spinner.unblock();
+            },
             onError: (error) => {
                 this.errorHandler.genericError();
+                spinner.unblock();
             }
         }
     }