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 ee249e1f1..7652541c8 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
@@ -260,7 +260,11 @@ private EntityDescriptor buildDescriptorFromRepresentation(final EntityDescripto
                 }
             }
         } else {
-            // TODO: implement
+            getOptionalSPSSODescriptorFromEntityDescriptor(ed).ifPresent( spssoDescriptor -> {
+                spssoDescriptor.setAuthnRequestsSigned((Boolean) null);
+                spssoDescriptor.setWantAssertionsSigned((Boolean) null);
+                spssoDescriptor.getKeyDescriptors().clear();
+            });
         }
 
         // setup ACSs
@@ -303,6 +307,10 @@ private EntityDescriptor buildDescriptorFromRepresentation(final EntityDescripto
         return ed;
     }
 
+    private Optional<SPSSODescriptor> getOptionalSPSSODescriptorFromEntityDescriptor(EntityDescriptor entityDescriptor) {
+        return Optional.ofNullable(getSPSSODescriptorFromEntityDescriptor(entityDescriptor, false));
+    }
+
     private  SPSSODescriptor getSPSSODescriptorFromEntityDescriptor(EntityDescriptor entityDescriptor) {
         return getSPSSODescriptorFromEntityDescriptor(entityDescriptor, true);
     }