diff --git a/app/controllers/spree/admin/orders/customer_details_controller.rb b/app/controllers/spree/admin/orders/customer_details_controller.rb
index 3644fbaf65..3b25a16671 100644
--- a/app/controllers/spree/admin/orders/customer_details_controller.rb
+++ b/app/controllers/spree/admin/orders/customer_details_controller.rb
@@ -25,9 +25,9 @@ module Spree
               @order.associate_user!(Spree.user_class.find_by(email: @order.email))
             end
 
+            refresh_shipment_rates
             OrderWorkflow.new(@order).advance_to_payment
 
-            @order.shipments.map(&:refresh_rates)
             flash[:success] = Spree.t('customer_details_updated')
             redirect_to spree.admin_order_customer_path(@order)
           else
@@ -43,6 +43,10 @@ module Spree
 
         private
 
+        def refresh_shipment_rates
+          @order.shipments.map(&:refresh_rates)
+        end
+
         def order_params
           params.require(:order).permit(
             :email,