diff --git a/composer.json b/composer.json
index 948c252..48bca53 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,14 @@
                     ]
                 }
             },
+            "magento/module-checkout": {
+                "Ensure that each billing address form DOM element has a unique id https://github.com/magento/magento2/pull/15349": {
+                    "source" : "patches/Magento_Checkout/billing-address-form.patch",
+                    "version" : [
+                        "100.2.*"
+                    ]
+                }
+            },
             "magento/module-configurable-product": {
                 "Add frontend validation for SKU on configurable product variation generation in admin panel": {
                     "source" : "patches/Magento_ConfigurableProduct/magento2-issue-11953.patch",
diff --git a/patches/Magento_Checkout/billing-address-form.patch b/patches/Magento_Checkout/billing-address-form.patch
new file mode 100644
index 0000000..8afdd44
--- /dev/null
+++ b/patches/Magento_Checkout/billing-address-form.patch
@@ -0,0 +1,13 @@
+diff --git a/view/frontend/web/template/billing-address/form.html b/view/frontend/web/template/billing-address/form.html
+index 1be754934042..00f87d325d96 100644
+--- a/view/frontend/web/template/billing-address/form.html
++++ b/view/frontend/web/template/billing-address/form.html
+@@ -9,7 +9,7 @@
+     <!-- ko template: getTemplate() --><!-- /ko -->
+     <!--/ko-->
+     <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
+-        <fieldset id="billing-new-address-form" class="fieldset address">
++        <fieldset data-bind="attr: { id:'billing-new-address-form-'+index, value:index}" class="fieldset address">
+             <!-- ko foreach: getRegion('additional-fieldsets') -->
+             <!-- ko template: getTemplate() --><!-- /ko -->
+             <!--/ko-->
\ No newline at end of file