diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 66b2e7129b..4ffe08afaf 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -433,6 +433,7 @@ module Spree
       all_adjustments.destroy_all
       payments.clear
       shipments.destroy_all
+      restart_checkout_flow if state == "payment"
     end
 
     def state_changed(name)