diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 88c2c2e277e..11c839dc95c 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -273,7 +273,7 @@ def associate_user!(user, override_email = true)
 
       # immediately persist the changes we just made, but don't use save
       # since we might have an invalid address associated
-      self.class.unscoped.where(id: self).update_all(changes)
+      update_columns(changes) if persisted?
     end
 
     def quantity_of(variant, options = {})