diff --git a/engines/order_management/app/services/order_management/stock/packer.rb b/engines/order_management/app/services/order_management/stock/packer.rb
index dc8c462783..7ad24c6b27 100644
--- a/engines/order_management/app/services/order_management/stock/packer.rb
+++ b/engines/order_management/app/services/order_management/stock/packer.rb
@@ -15,7 +15,9 @@ module OrderManagement
           variant = line_item.variant
           next unless variant.stock_item
 
-          OpenFoodNetwork::ScopeVariantToHub.new(order.distributor).scope(variant)
+          if OpenFoodNetwork::FeatureToggle.enabled?(:inventory, order.distributor)
+            OpenFoodNetwork::ScopeVariantToHub.new(order.distributor).scope(variant)
+          end
 
           on_hand, backordered = variant.fill_status(line_item.quantity)
           package.add variant, on_hand, :on_hand if on_hand.positive?
diff --git a/engines/order_management/app/services/order_management/subscriptions/estimator.rb b/engines/order_management/app/services/order_management/subscriptions/estimator.rb
index 0ae41a2b2d..8f3744a7d6 100644
--- a/engines/order_management/app/services/order_management/subscriptions/estimator.rb
+++ b/engines/order_management/app/services/order_management/subscriptions/estimator.rb
@@ -34,7 +34,9 @@ module OrderManagement
       def price_estimate_for(variant, fallback)
         return fallback unless fee_calculator && variant
 
-        scoper.scope(variant)
+        if OpenFoodNetwork::FeatureToggle.enabled?(:inventory, shop)
+          scoper.scope(variant)
+        end
         fees = fee_calculator.indexed_fees_for(variant)
         (variant.price + fees).to_d
       end
diff --git a/engines/order_management/spec/services/order_management/stock/packer_spec.rb b/engines/order_management/spec/services/order_management/stock/packer_spec.rb
index a2669160af..8aad8ccc83 100644
--- a/engines/order_management/spec/services/order_management/stock/packer_spec.rb
+++ b/engines/order_management/spec/services/order_management/stock/packer_spec.rb
@@ -29,7 +29,7 @@ module OrderManagement
         expect(package.backordered.size).to eq 5
       end
 
-      it "accounts for variant overrides" do
+      it "accounts for variant overrides", feature: :inventory do
         variant = order.line_items.first.variant
         variant.on_hand = 0
         variant.on_demand = false
diff --git a/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
index 74b7514336..88cec9d7bd 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe OrderManagement::Subscriptions::Estimator do
         end
       end
 
-      context "when variant overrides apply" do
+      context "when variant overrides apply", feature: :inventory do
         let!(:override1) {
           create(:variant_override, hub: subscription.shop, variant: sli1.variant, price: 1.2)
         }