diff --git a/view/frontend/web/js/view/payment/method-renderer/cc-form.js b/view/frontend/web/js/view/payment/method-renderer/cc-form.js
index f159a44..6ea4dfd 100644
--- a/view/frontend/web/js/view/payment/method-renderer/cc-form.js
+++ b/view/frontend/web/js/view/payment/method-renderer/cc-form.js
@@ -101,10 +101,17 @@ define(
                 });
 
                 PaymentFields.on('challengeShown', (data) => {
+                    $('#sp-payment-fields-three-ds-challenge-iframe').on('load', function() {
+                        $(this).contents().find('#cancel-challenge').on('click', function() {
+                            $('#sp-payment-fields-three-ds-challenge-iframe').remove();
+                        });
+                    });
                     $('body').trigger('processStop');
                 });
 
                 PaymentFields.on('challengeHidden', (data) => {
+
+
                     $('body').trigger('processStop');
                 });
                 let authConfig = config.getConfig().sessionAccessToken;
diff --git a/view/frontend/web/js/view/vault/card.js b/view/frontend/web/js/view/vault/card.js
index 885a468..e32ba71 100644
--- a/view/frontend/web/js/view/vault/card.js
+++ b/view/frontend/web/js/view/vault/card.js
@@ -88,6 +88,11 @@ define(
                 });
 
                 PaymentFields.on('challengeShown', (data) => {
+                    $('#sp-payment-fields-three-ds-challenge-iframe').on('load', function() {
+                        $(this).contents().find('#cancel-challenge').on('click', function() {
+                            $('#sp-payment-fields-three-ds-challenge-iframe').remove();
+                        });
+                    });
                     $('body').trigger('processStop');
                 });
                 PaymentFields.on('challengeHidden', (data) => {