diff --git a/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js b/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js
index 4a7ab80de..4e67aaf1b 100644
--- a/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js
+++ b/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js
@@ -198,6 +198,13 @@ document.addEventListener(
                     }
 
                     document.querySelector('#place_order')?.addEventListener("click", (event) => {
+                        if (
+                            getCurrentPaymentMethod() !== 'ppcp-credit-card-gateway'
+                            || document.querySelector('input[name="wc-ppcp-credit-card-gateway-payment-token"]:checked')?.value !== 'new'
+                        ) {
+                            return;
+                        }
+
                         event.preventDefault();
 
                         cardField.submit()