diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index b7357c549036112262cf324d1d7764d12e36b687..bcc445b4147b1031abaff193b34f4a629b05aa52 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -41,6 +41,12 @@ try {
 				array('entityid', 'SingleSignOnService', 'SingleLogoutService', 'certFingerprint'),
 				array('name', 'description', 'base64attributes', 'certificate', 'hint.cidr', 'saml2.relaxvalidation', 'SingleLogoutServiceResponse', 'request.signing', 'attributemap', 'attributealter', 'sharedkey', 'assertion.encryption', 'icon')
 			);
+			$index = array_search('certFingerprint', $results[$entityid]['required.notfound']);
+			if ($index !== FALSE) {
+				if (array_key_exists('certificate', $mentry)) {
+					unset($results[$entityid]['required.notfound'][$index]);
+				}
+			}
 		}
 		$et->data['metadata.saml20-idp-remote'] = $results;