diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 6b3b463b7f..7f8d69474c 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -426,19 +426,6 @@ module Spree
       restart_checkout_flow if state.in?(["payment", "confirmation"])
     end
 
-    def state_changed(name)
-      state = "#{name}_state"
-      return unless persisted?
-
-      old_state = __send__("#{state}_was")
-      state_changes.create(
-        previous_state: old_state,
-        next_state: __send__(state),
-        name: name,
-        user_id: user_id
-      )
-    end
-
     def shipped?
       %w(partial shipped).include?(shipment_state)
     end
diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
index 01997e676c..23606d52cf 100644
--- a/app/models/spree/order/checkout.rb
+++ b/app/models/spree/order/checkout.rb
@@ -136,6 +136,19 @@ module Spree
             )
           end
 
+          def state_changed(name)
+            state = "#{name}_state"
+            return unless persisted?
+
+            old_state = __send__("#{state}_was")
+            state_changes.create(
+              previous_state: old_state,
+              next_state: __send__(state),
+              name: name,
+              user_id: user_id
+            )
+          end
+
           private
 
           def validate_payment_method!