diff --git a/modules/saml/lib/Message.php b/modules/saml/lib/Message.php
index 0db3c7c1f67b256a4d43477983bdf9508d571563..a0f71931047530360fb41d4168301d57d6b14393 100644
--- a/modules/saml/lib/Message.php
+++ b/modules/saml/lib/Message.php
@@ -556,7 +556,10 @@ class Message
         \SimpleSAML\Configuration $dstMetadata
     ) {
         $lr = new \SAML2\LogoutResponse();
-        $lr->setIssuer($srcMetadata->getString('entityid'));
+        $issuer = new Issuer();
+        $issuer->setValue($srcMetadata->getString('entityid'));
+        $issuer->setFormat(Constants::NAMEID_ENTITY);
+        $lr->setIssuer($issuer);
 
         self::addRedirectSign($srcMetadata, $dstMetadata, $lr);