diff --git a/src/ContactEdit.tsx b/src/ContactEdit.tsx
index 5f04f03..25f1e40 100644
--- a/src/ContactEdit.tsx
+++ b/src/ContactEdit.tsx
@@ -283,7 +283,10 @@ class ContactEdit extends React.Component {
     )));
 
     function setProperty(name: string, value: string) {
-      comp.updatePropertyWithValue(name, value);
+      comp.removeAllProperties(name);
+      if (value !== '') {
+        comp.updatePropertyWithValue(name, value);
+      }
     }
 
     setProperty('org', this.state.org);