diff --git a/app/services/user_default_address_setter.rb b/app/services/user_default_address_setter.rb
index 7a83078290..0746bae8cf 100644
--- a/app/services/user_default_address_setter.rb
+++ b/app/services/user_default_address_setter.rb
@@ -9,7 +9,7 @@ class UserDefaultAddressSetter
 
   # Sets the order bill address as the user default bill address
   def set_default_bill_address
-    new_bill_address = @order.bill_address.clone.attributes
+    new_bill_address = @order.bill_address.dup.attributes
 
     set_bill_address_attributes(@current_user, new_bill_address)
     set_bill_address_attributes(@order.customer, new_bill_address)
@@ -17,7 +17,7 @@ class UserDefaultAddressSetter
 
   # Sets the order ship address as the user default ship address
   def set_default_ship_address
-    new_ship_address = @order.ship_address.clone.attributes
+    new_ship_address = @order.ship_address.dup.attributes
 
     set_ship_address_attributes(@current_user, new_ship_address)
     set_ship_address_attributes(@order.customer, new_ship_address)