diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 3729d4c7bf6931f16a2056ea05ee53a8a3106396..1f0d31bc301ecbea6222b9992b5bad2b3fb7b3e3 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -210,6 +210,9 @@ if (count($keys) === 1) {
 	$metaArray20['keys'] = $keys;
 }
 
+/* Sign the metadata if enabled. */
+$xml = SimpleSAML_Metadata_Signer::sign($xml, $sp, 'SAML 2 SP');
+
 if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
 
 	$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');