diff --git a/app/views/split_checkout/_payment.html.haml b/app/views/split_checkout/_payment.html.haml
index e1be8e9c05..0e98fe6df4 100644
--- a/app/views/split_checkout/_payment.html.haml
+++ b/app/views/split_checkout/_payment.html.haml
@@ -12,12 +12,12 @@
           name: "order[payments_attributes][][payment_method_id]",
           checked: (payment_method.id == selected_payment_method),
           "data-action": "paymentmethod#selectPaymentMethod",
-          "data-paymentmethod-id": "paymentmethod#{payment_method.id}",
+          "data-paymentmethod-id": "#{payment_method.id}",
           "data-paymentmethod-target": "input"
         = f.label :payment_method_id, "#{payment_method.name}", for: "payment_method_#{payment_method.id}"
         %em.fees=payment_or_shipping_price(payment_method, @order)
 
-      .paymentmethod-container{"data-paymentmethod-id": "paymentmethod#{payment_method.id}", style: "display: #{payment_method.id == selected_payment_method ? "block" : "none"}"}
+      .paymentmethod-container{"data-paymentmethod-id": "#{payment_method.id}", style: "display: #{payment_method.id == selected_payment_method ? "block" : "none"}"}
         - if payment_method.description && !payment_method.description.empty?
           .paymentmethod-description.panel
             #{payment_method.description}
diff --git a/app/views/split_checkout/payment/_stripe_sca.html.haml b/app/views/split_checkout/payment/_stripe_sca.html.haml
index ba451ff37d..6eed961989 100644
--- a/app/views/split_checkout/payment/_stripe_sca.html.haml
+++ b/app/views/split_checkout/payment/_stripe_sca.html.haml
@@ -1,4 +1,4 @@
-%div{"data-controller": "stripe-cards"}
+%div{"data-controller": "stripe-cards", "data-paymentmethod-id": "#{payment_method.id}" }
   - if @saved_credit_cards.any?
     .checkout-input
       %label
diff --git a/app/webpacker/controllers/paymentmethod_controller.js b/app/webpacker/controllers/paymentmethod_controller.js
index b7a1b27e8d..00e607f333 100644
--- a/app/webpacker/controllers/paymentmethod_controller.js
+++ b/app/webpacker/controllers/paymentmethod_controller.js
@@ -12,17 +12,12 @@ export default class extends Controller {
 
   selectPaymentMethod(event) {
     this.setPaymentMethod(event.target.dataset.paymentmethodId);
-
-    const stripeCardSelector =
-      this.application.getControllerForElementAndIdentifier(
-        document
-          .querySelector(
-            `[data-paymentmethod-id="${event.target.dataset.paymentmethodId}"]`
-          )
-          .querySelector('[data-controller="stripe-cards"]'),
-        "stripe-cards"
-      );
-    stripeCardSelector?.initSelectedCard();
+    // Send an event to the right (ie. the one with the same paymentmethodId)
+    // StripeCardsController to initialize the form elements with the selected card
+    const customEvent = new CustomEvent("stripecards:initSelectedCard", {
+      detail: event.target.dataset.paymentmethodId,
+    });
+    document.dispatchEvent(customEvent);
   }
 
   setPaymentMethod(paymentMethodContainerId) {
diff --git a/app/webpacker/controllers/stripe_cards_controller.js b/app/webpacker/controllers/stripe_cards_controller.js
index 98c657867b..2a4ad18a00 100644
--- a/app/webpacker/controllers/stripe_cards_controller.js
+++ b/app/webpacker/controllers/stripe_cards_controller.js
@@ -7,6 +7,11 @@ export default class extends Controller {
 
   connect() {
     this.initSelectedCard();
+    document.addEventListener("stripecards:initSelectedCard", (e) => {
+      if (e.detail == this.element.dataset.paymentmethodId) {
+        this.initSelectedCard();
+      }
+    });
   }
 
   initSelectedCard() {
diff --git a/spec/javascripts/stimulus/paymentmethod_controller_test.js b/spec/javascripts/stimulus/paymentmethod_controller_test.js
index 483a159a80..f366df573a 100644
--- a/spec/javascripts/stimulus/paymentmethod_controller_test.js
+++ b/spec/javascripts/stimulus/paymentmethod_controller_test.js
@@ -14,23 +14,23 @@ describe("PaymentmethodController", () => {
   describe("#selectPaymentMethod", () => {
     beforeEach(() => {
       document.body.innerHTML = `<div data-controller="paymentmethod">
-         <input id="paymentmethod_1" data-action="click->paymentmethod#selectPaymentMethod" data-paymentmethod-id="paymentmethod1" data-paymentmethod-target="input" />
-         <input id="paymentmethod_2" data-action="click->paymentmethod#selectPaymentMethod" data-paymentmethod-id="paymentmethod2" data-paymentmethod-target="input" checked="checked" />
-         <input id="paymentmethod_3" data-action="click->paymentmethod#selectPaymentMethod" data-paymentmethod-id="paymentmethod3" data-paymentmethod-target="input"/>
+         <input id="paymentmethod_1" data-action="click->paymentmethod#selectPaymentMethod" data-paymentmethod-id="1" data-paymentmethod-target="input" />
+         <input id="paymentmethod_2" data-action="click->paymentmethod#selectPaymentMethod" data-paymentmethod-id="2" data-paymentmethod-target="input" checked="checked" />
+         <input id="paymentmethod_3" data-action="click->paymentmethod#selectPaymentMethod" data-paymentmethod-id="3" data-paymentmethod-target="input"/>
 
-         <div class="paymentmethod-container" id="paymentmethod1" data-paymentmethod-id="paymentmethod1">
+         <div class="paymentmethod-container" id="paymentmethod1" data-paymentmethod-id="1">
           <input type="number" id="input1" />
           <select id="select1" >
             <option value="1">1</option>
           </select>
          </div>
-         <div class="paymentmethod-container" id="paymentmethod2" data-paymentmethod-id="paymentmethod2">
+         <div class="paymentmethod-container" id="paymentmethod2" data-paymentmethod-id="2">
           <input type="number" id="input2" />
           <select id="select2" >
             <option value="1">1</option>
           </select>
          </div>
-         <div class="paymentmethod-container" id="paymentmethod3" data-paymentmethod-id="paymentmethod3">
+         <div class="paymentmethod-container" id="paymentmethod3" data-paymentmethod-id="3">
           <input type="number" id="input3" />
           <select id="select3" >
             <option value="1">1</option>