diff --git a/app/controllers/concerns/checkout_callbacks.rb b/app/controllers/concerns/checkout_callbacks.rb
index 08a063ee89..f29b81d7dc 100644
--- a/app/controllers/concerns/checkout_callbacks.rb
+++ b/app/controllers/concerns/checkout_callbacks.rb
@@ -35,8 +35,8 @@ module CheckoutCallbacks
   def load_saved_addresses
     finder = OpenFoodNetwork::AddressFinder.new(@order.email, @order.customer, spree_current_user)
 
-    @order.bill_address = finder.bill_address
-    @order.ship_address = finder.ship_address
+    @order.bill_address ||= finder.bill_address
+    @order.ship_address ||= finder.ship_address
   end
 
   def load_shipping_methods