diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid
index a79d8d86d63..f01907ec765 100644
--- a/sections/featured-product.liquid
+++ b/sections/featured-product.liquid
@@ -36,6 +36,9 @@
   endif
 -%}
 
+{% comment %} Temporary for restrict buying to B2B customers only {% endcomment %}
+{%- assign shop_restricted_b2b_buying_enabled = true %}
+
 {% comment %} TODO: assign `product.selected_or_first_available_variant` to variable and replace usage to reduce verbosity {% endcomment %}
 
 {%- assign first_3d_model = product.media | where: 'media_type', 'model' | first -%}
@@ -209,7 +212,7 @@
                   {{- product.selected_or_first_available_variant.sku -}}
                 </p>
               {%- when 'quantity_selector' -%}
-                {%- if shop.b2b_customers_enabled != blank -%}
+                {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
                   <div
                     id="Quantity-Form-{{ section.id }}"
                     class="product-form__input product-form__quantity{% if settings.inputs_shadow_vertical_offset != 0 and settings.inputs_shadow_vertical_offset < 0 %} product-form__quantity-top{% endif %}"
@@ -453,7 +456,7 @@
                   update_url: false
                 %}
               {%- when 'buy_buttons' -%}
-                {%- if shop.b2b_customers_enabled != blank -%}
+                {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
                   {%- render 'buy-buttons',
                     block: block,
                     product: product,
@@ -654,7 +657,7 @@
             "gtin14": {{ variant.barcode | json }},
           {%- endif -%}
           "availability" : "http://schema.org/{% if variant.available %}InStock{% else %}OutOfStock{% endif %}",
-          {%- if shop.b2b_customers_enabled != blank -%}
+          {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
             "price" : {{ variant.price | divided_by: 100.00 | json }},
           {%- endif -%}
           "priceCurrency" : {{ cart.currency.iso_code | json }},
diff --git a/sections/header.liquid b/sections/header.liquid
index e6304f389a5..f0cf20461ed 100644
--- a/sections/header.liquid
+++ b/sections/header.liquid
@@ -317,7 +317,9 @@
         {%- endcase -%}
       {%- endfor -%}
 
-      {%- if shop.b2b_customers_enabled != blank -%}
+      {% comment %} Temporary for restrict buying to B2B customers only {% endcomment %}
+      {%- assign shop_restricted_b2b_buying_enabled = true %}
+      {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
         <a href="{{ routes.cart_url }}" class="header__icon header__icon--cart link focus-inset" id="cart-icon-bubble">
           {%- liquid
             if cart == empty
diff --git a/sections/main-product.liquid b/sections/main-product.liquid
index 205612a297a..b3a5c47804e 100644
--- a/sections/main-product.liquid
+++ b/sections/main-product.liquid
@@ -41,6 +41,9 @@
     <script src="{{ 'theme-editor.js' | asset_url }}" defer="defer"></script>
   {%- endif -%}
 
+  {% comment %} Temporary for restrict buying to B2B customers only {% endcomment %}
+  {%- assign shop_restricted_b2b_buying_enabled = true %}
+
   {%- assign first_3d_model = product.media | where: 'media_type', 'model' | first -%}
   {%- if first_3d_model -%}
     {{ 'component-product-model.css' | asset_url | stylesheet_tag }}
@@ -207,7 +210,7 @@
                 </details>
               </div>
             {%- when 'quantity_selector' -%}
-              {%- if shop.b2b_customers_enabled != blank -%}
+              {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
                 <div
                   id="Quantity-Form-{{ section.id }}"
                   class="product-form__input product-form__quantity{% if settings.inputs_shadow_vertical_offset != 0 and settings.inputs_shadow_vertical_offset < 0 %} product-form__quantity-top{% endif %}"
@@ -384,7 +387,7 @@
                   {%- endif -%}
                 </div>
               {%- endif -%}
-              {%- when 'popup' -%}
+            {%- when 'popup' -%}
               <modal-opener
                 class="product-popup-modal__opener no-js-hidden quick-add-hidden"
                 data-modal="#PopupModal-{{ block.id }}"
@@ -412,7 +415,7 @@
             {%- when 'variant_picker' -%}
               {% render 'product-variant-picker', product: product, block: block, product_form_id: product_form_id %}
             {%- when 'buy_buttons' -%}
-              {%- if shop.b2b_customers_enabled != blank -%}
+              {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
                 {%- render 'buy-buttons', block: block, product: product, product_form_id: product_form_id, section_id: section.id, show_pickup_availability: true -%}
               {%- endif -%}
             {%- when 'rating' -%}
@@ -663,7 +666,7 @@
               "gtin14": {{ variant.barcode }},
             {%- endif -%}
             "availability" : "http://schema.org/{% if variant.available %}InStock{% else %}OutOfStock{% endif %}",
-            {%- if shop.b2b_customers_enabled != blank -%}
+            {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
               "price" : {{ variant.price | divided_by: 100.00 | json }},
             {%- endif -%}
             "priceCurrency" : {{ cart.currency.iso_code | json }},
diff --git a/snippets/card-product.liquid b/snippets/card-product.liquid
index d02e1766d63..2d207d1e7ec 100644
--- a/snippets/card-product.liquid
+++ b/snippets/card-product.liquid
@@ -23,6 +23,9 @@
 {{ 'component-rating.css' | asset_url | stylesheet_tag }}
 {{ 'component-volume-pricing.css' | asset_url | stylesheet_tag }}
 
+{% comment %} Temporary for restrict buying to B2B customers only {% endcomment %}
+{%- assign shop_restricted_b2b_buying_enabled = true %}
+
 {%- if card_product and card_product != empty -%}
   {%- liquid
     assign ratio = 1
@@ -119,7 +122,7 @@
               </a>
             </h3>
           </div>
-          {%- if shop.b2b_customers_enabled != blank -%}
+          {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
             <div class="card__badge {{ settings.badge_position }}">
               {%- if card_product.available == false -%}
                 <span
@@ -209,7 +212,7 @@
             {%- endif -%}
           </div>
         </div>
-        {%- if shop.b2b_customers_enabled != blank -%}
+        {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
           {%- if show_quick_add -%}
             <div class="quick-add no-js-hidden">
               {%- liquid
diff --git a/snippets/meta-tags.liquid b/snippets/meta-tags.liquid
index 45ccdcdd3c3..c7dac096c8d 100644
--- a/snippets/meta-tags.liquid
+++ b/snippets/meta-tags.liquid
@@ -26,8 +26,11 @@
   <meta property="og:image:height" content="{{ page_image.height }}">
 {%- endif -%}
 
+{% comment %} Temporary for restrict buying to B2B customers only {% endcomment %}
+{%- assign shop_restricted_b2b_buying_enabled = true %}
+
 {%- if request.page_type == 'product' -%}
-  {%- if shop.b2b_customers_enabled != blank -%}
+  {%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
     <meta property="og:price:amount" content="{{ product.price | money_without_currency | strip_html }}">
   {%- endif -%}
   <meta property="og:price:currency" content="{{ cart.currency.iso_code }}">
diff --git a/snippets/price.liquid b/snippets/price.liquid
index 049727cc191..d89ab7c2032 100644
--- a/snippets/price.liquid
+++ b/snippets/price.liquid
@@ -37,7 +37,10 @@
   endif
 -%}
 
-{%- if shop.b2b_customers_enabled != blank -%}
+{% comment %} Temporary for restrict buying to B2B customers only {% endcomment %}
+{%- assign shop_restricted_b2b_buying_enabled = true %}
+
+{%- if shop_restricted_b2b_buying_enabled == false or shop_restricted_b2b_buying_enabled and customer.b2b? -%}
   <div
     class="
       price
@@ -75,10 +78,7 @@
           {%- endif -%}
           <span class="visually-hidden visually-hidden--inline">{{ 'products.product.price.regular_price' | t }}</span>
           <span class="price-item price-item--regular">
-            {{-
-              'products.product.volume_pricing.price_range'
-              | t: minimum: money_price_min, maximum: money_price_max
-            -}}
+            {{- 'products.product.volume_pricing.price_range' | t: minimum: money_price_min, maximum: money_price_max -}}
           </span>
         {%- else -%}
           <span class="visually-hidden visually-hidden--inline">{{ 'products.product.price.regular_price' | t }}</span>