diff --git a/assets/product-form.js b/assets/product-form.js
index 974920ad890..6eec3bc2313 100644
--- a/assets/product-form.js
+++ b/assets/product-form.js
@@ -26,7 +26,7 @@ if (!customElements.get('product-form')) {
       delete config.headers['Content-Type'];
 
       const formData = new FormData(this.form);
-      if (this.dataset.cartType != 'page') {
+      if (this.cart) {
         formData.append('sections', this.cart.getSectionsToRender().map((section) => section.id));
         formData.append('sections_url', window.location.pathname);
         this.cart.setActiveElement(document.activeElement);
@@ -46,7 +46,7 @@ if (!customElements.get('product-form')) {
             soldOutMessage.classList.remove('hidden');
             this.error = true;
             return;
-          } else if (this.dataset.cartType == 'page') {
+          } else if (!this.cart) {
             window.location = window.routes.cart_url;
             return;
           }
diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid
index c5e12f21349..e5aba9c027f 100644
--- a/sections/featured-product.liquid
+++ b/sections/featured-product.liquid
@@ -257,7 +257,7 @@
             {%- when 'buy_buttons' -%}
               <div {{ block.shopify_attributes }}>
                 {%- if product != blank -%}
-                  <product-form class="product-form" data-cart-type="{{ settings.cart_type }}">
+                  <product-form class="product-form">
                     <div class="product-form__error-message-wrapper" role="alert" hidden>
                       <svg aria-hidden="true" focusable="false" role="presentation" class="icon icon-error" viewBox="0 0 13 13">
                         <circle cx="6.5" cy="6.50049" r="5.5" stroke="white" stroke-width="2"/>
diff --git a/sections/main-product.liquid b/sections/main-product.liquid
index 0a0bd37f542..fdf46bfd44f 100644
--- a/sections/main-product.liquid
+++ b/sections/main-product.liquid
@@ -411,7 +411,7 @@
             </noscript>
           {%- when 'buy_buttons' -%}
             <div {{ block.shopify_attributes }}>
-              <product-form class="product-form" data-cart-type="{{ settings.cart_type }}">
+              <product-form class="product-form">
                 <div class="product-form__error-message-wrapper" role="alert" hidden>
                   <svg aria-hidden="true" focusable="false" role="presentation" class="icon icon-error" viewBox="0 0 13 13">
                     <circle cx="6.5" cy="6.50049" r="5.5" stroke="white" stroke-width="2"/>