diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java
index e25379f30..1fc7c9439 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java
@@ -62,7 +62,7 @@ public Instant getValidUntil() {
 
     @Override
     public void setValidUntil(Instant validUntilInstant) {
-        this.validUntil = LocalDateTime.ofInstant(validUntilInstant, ZoneOffset.UTC);
+        this.validUntil = validUntilInstant == null ? null : LocalDateTime.ofInstant(validUntilInstant, ZoneOffset.UTC);
     }
 
     @Override