diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
index 6a6bee68c4..3575dc1ae0 100644
--- a/app/models/spree/order/checkout.rb
+++ b/app/models/spree/order/checkout.rb
@@ -147,7 +147,7 @@ module Spree
           private
 
           def after_cancel
-            shipments.each(&:cancel!)
+            shipments.reject(&:canceled?).each(&:cancel!)
             payments.checkout.each(&:void!)
 
             OrderMailer.cancel_email(id).deliver_later if send_cancellation_email