diff --git a/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js b/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
index 22ec9a2d8..b724248ba 100644
--- a/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
+++ b/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
@@ -24,11 +24,11 @@ class CheckoutBootstap {
 
           })
 
-        setTimeout(() => {
+        jQuery(document).on('hosted_fields_loaded', () => {
             jQuery('#saved-credit-card').on('change', () => {
                 this.displayPlaceOrderButtonForSavedCreditCards()
             })
-        }, 3000)
+        });
 
         this.switchBetweenPayPalandOrderButton()
         this.displayPlaceOrderButtonForSavedCreditCards()
diff --git a/modules/ppcp-button/resources/js/modules/Renderer/CreditCardRenderer.js b/modules/ppcp-button/resources/js/modules/Renderer/CreditCardRenderer.js
index d506fadce..7005afa6a 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/CreditCardRenderer.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/CreditCardRenderer.js
@@ -100,6 +100,7 @@ class CreditCardRenderer {
                 }
             }
         }).then(hostedFields => {
+            document.dispatchEvent(new CustomEvent("hosted_fields_loaded"));
             this.currentHostedFieldsInstance = hostedFields;
 
             hostedFields.on('inputSubmitRequest', () => {