diff --git a/app/models/spree/address.rb b/app/models/spree/address.rb
index 5dbd0dd535..855cfa67d1 100644
--- a/app/models/spree/address.rb
+++ b/app/models/spree/address.rb
@@ -152,7 +152,9 @@ module Spree
     end
 
     def touch_enterprise
-      enterprise.andand.touch
+      return unless enterprise&.persisted?
+
+      enterprise.touch
     end
 
     def render_address(parts)