diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index 35e3a6343..c444bd214 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -295,7 +295,9 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 case MetadataRequestURLConstructionScheme.SchemeType.METADATA_QUERY_PROTOCOL:
                     MetadataQueryProtocolScheme scheme = (MetadataQueryProtocolScheme) resolver.metadataRequestURLConstructionScheme
                     MetadataQueryProtocol(transformRef: scheme.transformRef) {
-                        mkp.yield(scheme.content)
+                        if (scheme.content != null) {
+                            mkp.yield(scheme.content)
+                        }
                     }
                     break
                 case MetadataRequestURLConstructionScheme.SchemeType.TEMPLATE:
@@ -303,13 +305,17 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     Template(encodingStyle: scheme.encodingStyle,
                             transformRef: scheme.transformRef,
                             velocityEngine: scheme.velocityEngine) {
-                        mkp.yield(scheme.content)
+                        if (scheme.content != null) {
+                            mkp.yield(scheme.content)
+                        }
                     }
                     break
                 case MetadataRequestURLConstructionScheme.SchemeType.REGEX:
                     RegexScheme scheme = (RegexScheme) resolver.metadataRequestURLConstructionScheme
                     Regex(match: scheme.match) {
-                        mkp.yield(scheme.content)
+                        if (scheme.content != null) {
+                            mkp.yield(scheme.content)
+                        }
                     }
                     break
                 default:
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
index cae0c8afc..19c0fb5e3 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -57,8 +57,6 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         metadataResolverRepository.save(mr)
         def output = metadataResolverService.generateConfiguration()
 
-        println(output.documentElement)
-
         then:
         generatedXmlIsTheSameAsExpectedXml('/conf/278.xml', output)
     }
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
index eaf031c3e..071516cc2 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -512,6 +512,11 @@ class TestObjectGenerator {
             it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes().with {
                 it
             }
+            it.metadataRequestURLConstructionScheme = new MetadataQueryProtocolScheme().with {
+                it.transformRef = 'transformRef'
+                it.content = 'content'
+                it
+            }
             it
         }
     }
diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
index 269a2f3ec..b6c1d0d89 100644
--- a/backend/src/test/resources/conf/278.2.xml
+++ b/backend/src/test/resources/conf/278.2.xml
@@ -23,6 +23,7 @@
                       socketTimeout="PT5S"
                       supportedContentTypes="[]"
                       xsi:type="DynamicHttpMetadataProvider">
+        <MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
         <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
         <MetadataFilter xsi:type="EntityAttributes">
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
index 3bebc347b..6db6e5cfa 100644
--- a/backend/src/test/resources/conf/278.xml
+++ b/backend/src/test/resources/conf/278.xml
@@ -23,6 +23,7 @@
                       socketTimeout="PT5S"
                       supportedContentTypes="[]"
                       xsi:type="DynamicHttpMetadataProvider">
+        <MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
         <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
         <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">