diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid
index 8eb489d6c3b..462ac461eb8 100644
--- a/sections/featured-product.liquid
+++ b/sections/featured-product.liquid
@@ -144,8 +144,7 @@
                   {%- endif -%}
                   {%- unless placeholder -%}
                     <div {{ block.shopify_attributes }}>
-                      {%- form 'product', product -%}
-                        <input type="hidden" name="id" value="{{ product.selected_or_first_available_variant.id }}">
+                      {%- form 'product', product.selected_or_first_available_variant -%}
                         {{ form | payment_terms }}
                       {%- endform -%}
                     </div>
diff --git a/sections/main-product.liquid b/sections/main-product.liquid
index 30890e47acf..9546b5546f2 100644
--- a/sections/main-product.liquid
+++ b/sections/main-product.liquid
@@ -135,8 +135,11 @@
                 {%- endif -%}
                 <div {{ block.shopify_attributes }}>
                   {%- assign product_form_installment_id = 'product-form-installment-' | append: section.id -%}
-                  {%- form 'product', product, id: product_form_installment_id, class: 'installment caption-large' -%}
-                    <input type="hidden" name="id" value="{{ product.selected_or_first_available_variant.id }}">
+                  {%- form 'product',
+                    product.selected_or_first_available_variant,
+                    id: product_form_installment_id,
+                    class: 'installment caption-large'
+                  -%}
                     {{ form | payment_terms }}
                   {%- endform -%}
                 </div>
diff --git a/snippets/buy-buttons.liquid b/snippets/buy-buttons.liquid
index d2aefae0d9a..b713b1314c6 100644
--- a/snippets/buy-buttons.liquid
+++ b/snippets/buy-buttons.liquid
@@ -37,25 +37,12 @@
       </div>
 
       {%- form 'product',
-        product,
+        product.selected_or_first_available_variant,
         id: product_form_id,
         class: 'form',
         novalidate: 'novalidate',
         data-type: 'add-to-cart-form'
       -%}
-        <input
-          type="hidden"
-          name="id"
-          value="{{ product.selected_or_first_available_variant.id }}"
-          {% if product.selected_or_first_available_variant.available == false
-            or quantity_rule_soldout
-            or product.selected_or_first_available_variant == null
-          %}
-            disabled
-          {% endif %}
-          class="product-variant-id"
-        >
-
         {%- if gift_card_recipient_feature_active -%}
           {%- render 'gift-card-recipient-form', product: product, form: form, section: section -%}
         {%- endif -%}
diff --git a/snippets/card-product.liquid b/snippets/card-product.liquid
index feb720cacb5..cb38873234f 100644
--- a/snippets/card-product.liquid
+++ b/snippets/card-product.liquid
@@ -345,15 +345,6 @@
                   novalidate: 'novalidate',
                   data-type: 'add-to-cart-form'
                 -%}
-                  <input
-                    type="hidden"
-                    name="id"
-                    value="{{ card_product.selected_or_first_available_variant.id }}"
-                    class="product-variant-id"
-                    {% if card_product.selected_or_first_available_variant.available == false %}
-                      disabled
-                    {% endif %}
-                  >
                   <button
                     id="{{ product_form_id }}-submit"
                     type="submit"