diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java
index 0f96e0895..ae443a055 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java
@@ -106,7 +106,7 @@ public List<Attribute> getAttributeListFromRelyingPartyOverridesRepresentation(M
                 case BOOLEAN:
                     if (overrideProperty.getPersistType() != null &&
                         !overrideProperty.getPersistType().equalsIgnoreCase("boolean") &&
-                            Boolean.valueOf((String)entry.getValue())) {
+                            ((entry.getValue() instanceof Boolean && (Boolean)entry.getValue()) || Boolean.valueOf((String)entry.getValue()))) {
                         list.add(attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(),
                                                                                    overrideProperty.getAttributeFriendlyName(),
                                                                                    overrideProperty.getPersistValue()));