diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 301f17a422..1d37534b07 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -21,7 +21,7 @@ module Spree
         order.payment_required?
       }
       go_to_state :confirmation, if: ->(order) {
-        Flipper.enabled? :split_checkout, order.user
+        Flipper.enabled? :split_checkout
       }
       go_to_state :complete
     end
diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
index dd4d0a80e6..d1e0d5d36c 100644
--- a/app/models/spree/order/checkout.rb
+++ b/app/models/spree/order/checkout.rb
@@ -141,7 +141,7 @@ module Spree
           private
 
           def validate_shipping_method!
-            return unless user && Flipper.enabled?(:split_checkout, user)
+            return unless Flipper.enabled?(:split_checkout)
             return if shipping_method.present?
 
             errors.add :shipping_method, I18n.t('split_checkout.errors.select_a_shipping_method')
@@ -149,7 +149,7 @@ module Spree
           end
 
           def validate_payment_method!
-            return unless user && Flipper.enabled?(:split_checkout, user)
+            return unless Flipper.enabled?(:split_checkout)
             return if payments.any?
 
             errors.add :payment_method, I18n.t('split_checkout.errors.select_a_payment_method')