diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
index e4ba0ee5e..15d7ca41d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -267,6 +267,7 @@ void setupUIInfo(EntityDescriptor ed, EntityDescriptorRepresentation representat
     void setupContacts(EntityDescriptor ed, EntityDescriptorRepresentation representation) {
         // set up contacts
         if (representation.getContacts() != null && representation.getContacts().size() > 0) {
+            ed.getContactPersons().clear();
             for (ContactRepresentation contactRepresentation : representation.getContacts()) {
                 ContactPerson contactPerson = ((ContactPersonBuilder) openSamlObjects.getBuilderFactory().getBuilder(ContactPerson.DEFAULT_ELEMENT_NAME)).buildObject();
 
@@ -325,7 +326,7 @@ void setupSPSSODescriptor(EntityDescriptor ed, EntityDescriptorRepresentation re
                 );
             }
 
-
+            spssoDescriptor.getNameIDFormats().clear();
             if (representation.getServiceProviderSsoDescriptor() != null && representation.getServiceProviderSsoDescriptor().getNameIdFormats() != null && representation.getServiceProviderSsoDescriptor().getNameIdFormats().size() > 0) {
                 for (String nameidFormat : representation.getServiceProviderSsoDescriptor().getNameIdFormats()) {
                     NameIDFormat nameIDFormat = openSamlObjects.buildDefaultInstanceOfType(NameIDFormat.class);