diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 29308910e0..ec9721a33d 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -153,7 +153,7 @@ Spree::Order.class_eval do
   def update_shipping_fees!
     shipments.each do |shipment|
       next if shipment.shipped?
-      update_adjustment! shipment.adjustment
+      update_adjustment! shipment.adjustment if shipment.adjustment
       shipment.save # updates included tax
     end
   end
@@ -164,7 +164,7 @@ Spree::Order.class_eval do
   def update_payment_fees!
     payments.each do |payment|
       next if payment.completed?
-      update_adjustment! payment.adjustment
+      update_adjustment! payment.adjustment if payment.adjustment
       payment.save
     end
   end