diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java
index 8b22abbda..fbe320a36 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java
@@ -1,5 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -24,6 +26,8 @@
 @Getter
 @Setter
 @ToString
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
+@JsonSubTypes({@JsonSubTypes.Type(value=EntityRoleWhiteListFilter.class, name="EntityRoleWhiteList")})
 public class MetadataFilter extends AbstractAuditable {
 
     private String name;
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy
new file mode 100644
index 000000000..7fe6f2dd7
--- /dev/null
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy
@@ -0,0 +1,80 @@
+package edu.internet2.tier.shibboleth.admin.ui.domain
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.MetadataResolverConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.controller.FilterController
+import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributesFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
+import edu.internet2.tier.shibboleth.admin.ui.service.FilterService
+import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService
+import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator
+import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
+import edu.internet2.tier.shibboleth.admin.util.AttributeUtility
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.domain.EntityScan
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
+import org.w3c.dom.Document
+import spock.lang.Specification
+
+import static org.hamcrest.CoreMatchers.containsString
+import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*
+
+class PolymorphicFiltersJacksonHandlingTests extends Specification {
+
+    @Autowired
+    FilterService filterService
+
+    ObjectMapper mapper
+
+    def setup() {
+        mapper = new ObjectMapper()
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+    }
+
+    def "Correct polymorphic serialization of EntityRoleWhiteListFilter"() {
+        given:
+        def givenFilterJson = """
+            {
+                "type" : "EntityRoleWhiteList",
+                "createdDate" : null,
+                "modifiedDate" : null,
+                "createdBy" : null,
+                "modifiedBy" : null,
+                "name" : "EntityRoleWhiteListFilter",
+                "resourceId" : "r1",
+                "filterEnabled" : false,
+                "version" : 0,
+                "removeRolelessEntityDescriptors" : true,
+                "removeEmptyEntitiesDescriptors" : true,
+                "retainedRoles" : [ "role1", "role2" ],
+                "audId" : null
+            }
+        """
+
+        when:
+        def deSerializedFilter = mapper.readValue(givenFilterJson, MetadataFilter)
+        def roundTripFilter = mapper.readValue(mapper.writeValueAsString(deSerializedFilter), MetadataFilter)
+
+
+        then:
+        roundTripFilter == deSerializedFilter
+
+        and:
+        deSerializedFilter instanceof EntityRoleWhiteListFilter
+        roundTripFilter instanceof EntityRoleWhiteListFilter
+    }
+}