diff --git a/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/msomdoc/MsoMdocSigner.kt b/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/msomdoc/MsoMdocSigner.kt
index 6f681eeb..630c5dda 100644
--- a/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/msomdoc/MsoMdocSigner.kt
+++ b/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/msomdoc/MsoMdocSigner.kt
@@ -23,7 +23,6 @@ import eu.europa.ec.eudi.pidissuer.domain.MsoDocType
 import id.walt.mdoc.SimpleCOSECryptoProvider
 import id.walt.mdoc.dataelement.DataElement
 import id.walt.mdoc.dataelement.MapElement
-import id.walt.mdoc.dataretrieval.DeviceResponse
 import id.walt.mdoc.doc.MDocBuilder
 import id.walt.mdoc.mso.DeviceKeyInfo
 import id.walt.mdoc.mso.ValidityInfo
@@ -59,8 +58,7 @@ internal class MsoMdocSigner<in Credential>(
             val mdoc = MDocBuilder(docType)
                 .apply { usage(credential) }
                 .sign(validityInfo, deviceKeyInfo, issuerCryptoProvider, issuerSigningKey.key.keyID)
-            val deviceResponse = DeviceResponse(documents = listOf(mdoc))
-            Base64.UrlSafe.encode(deviceResponse.toCBOR())
+            Base64.UrlSafe.encode(mdoc.issuerSigned.toMapElement().toCBOR())
         }
 
     private fun validityInfo(): ValidityInfo {