diff --git a/tailbone/views/master.py b/tailbone/views/master.py
index 97b5063c..12e5fe74 100644
--- a/tailbone/views/master.py
+++ b/tailbone/views/master.py
@@ -2752,7 +2752,7 @@ class MasterView(View):
             else:
                 contact.add_mailing_address(**addr)
 
-        elif contact.addresses:
+        elif any([field in data for field in address_fields]) and contact.addresses:
             contact.addresses.pop()
 
         return contact