diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
index 821d9817d..c662b1388 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
@@ -10,12 +10,14 @@
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 public class EntityDescriptorRepresentation implements Serializable {
     private static final long serialVersionUID = 7753435553892353966L;
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS");
 
     private List<AssertionConsumerServiceRepresentation> assertionConsumerServices;
 
@@ -98,7 +100,7 @@ public String getCreatedBy() {
     }
 
     public String getCreatedDate() {
-        return createdDate != null ? createdDate.toString() : null;
+        return createdDate != null ? formatter.format(createdDate) : null;
     }
 
     public String getEntityId() {
@@ -125,7 +127,7 @@ public MduiRepresentation getMdui() {
     }
 
     public String getModifiedDate() {
-        return modifiedDate != null ? modifiedDate.toString() : null;
+        return modifiedDate != null ? formatter.format(modifiedDate) : null;
     }
 
     @JsonIgnore
@@ -134,7 +136,6 @@ public LocalDateTime getModifiedDateAsDate() {
         return modifiedDate != null ? modifiedDate : createdDate != null ? createdDate : LocalDateTime.now();
     }
 
-
     public OrganizationRepresentation getOrganization() {
         return organization;
     }
@@ -245,4 +246,4 @@ public void setServiceProviderSsoDescriptor(ServiceProviderSsoDescriptorRepresen
     public void setVersion(int version) {
         this.version = version;
     }
-}
+}
\ No newline at end of file