diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 776e654192..c73f4453f0 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -310,6 +310,8 @@ module Spree
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
+      return if state.in?(["cart", "address", "delivery"]) && Flipper.enabled?(:split_checkout)
+
       clear_legacy_taxes!
 
       Spree::TaxRate.adjust(self, line_items)