diff --git a/modules.local/ppcp-button/resources/js/button.js b/modules.local/ppcp-button/resources/js/button.js
index c6f8a88d2..437b1e412 100644
--- a/modules.local/ppcp-button/resources/js/button.js
+++ b/modules.local/ppcp-button/resources/js/button.js
@@ -51,7 +51,9 @@ const bootstrap = () => {
         checkoutBootstap.init();
     }
 
-    messageRenderer.render();
+    if (context !== 'checkout') {
+        messageRenderer.render();
+    }
 };
 document.addEventListener(
     'DOMContentLoaded',
diff --git a/modules.local/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js b/modules.local/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
index a04153607..ce5374519 100644
--- a/modules.local/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
+++ b/modules.local/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
@@ -45,7 +45,6 @@ class CheckoutBootstap {
             this.gateway.hosted_fields.wrapper,
             actionHandler.configuration(),
         );
-        this.messages.render();
     }
 
     switchBetweenPayPalandOrderButton() {
@@ -63,6 +62,7 @@ class CheckoutBootstap {
             if (currentPaymentMethod === 'ppcp-gateway') {
                 this.renderer.showButtons(this.gateway.button.wrapper);
                 this.renderer.showButtons(this.gateway.messages.wrapper);
+                this.messages.render();
                 this.renderer.hideButtons(this.gateway.hosted_fields.wrapper);
             }
             if (currentPaymentMethod === 'ppcp-credit-card-gateway') {