diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index b4b2c3bf75..4ffe08afaf 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -430,9 +430,10 @@ module Spree
 
     def empty!
       line_items.destroy_all
-      adjustments.destroy_all
+      all_adjustments.destroy_all
       payments.clear
       shipments.destroy_all
+      restart_checkout_flow if state == "payment"
     end
 
     def state_changed(name)
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index beea7371cc..c490457aa3 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -315,7 +315,7 @@ describe Spree::Order do
       allow(order).to receive_messages(line_items: line_items = [])
       allow(order).to receive_messages(adjustments: adjustments = [])
       expect(order.line_items).to receive(:destroy_all)
-      expect(order.adjustments).to receive(:destroy_all)
+      expect(order.all_adjustments).to receive(:destroy_all)
 
       order.empty!
     end