diff --git a/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusList2021EntryClientService.kt b/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusList2021EntryClientService.kt
index b60c55c6..971e719a 100644
--- a/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusList2021EntryClientService.kt
+++ b/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusList2021EntryClientService.kt
@@ -47,7 +47,11 @@ class StatusList2021EntryClientService: RevocationClientService {
         bitSet.set(idx)
         val encodedList = createEncodedBitString(bitSet)
         // create / update the status list credential
-        credentialStorage.store(statusCredential.id!!, credentialSubject.statusPurpose, String(encodedList))
+        statusCredential.issuerId?.let {
+            credentialStorage.store(
+                it, statusCredential.id!!, credentialSubject.statusPurpose, String(encodedList)
+            )
+        } ?: throw IllegalArgumentException("Missing issuer for statusList credential.")
     }
 
     private fun extractStatusListCredentialSubject(statusCredentialUrl: String): StatusListCredentialSubject? =
diff --git a/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusListCredentialStorageService.kt b/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusListCredentialStorageService.kt
index 28b91186..98183e57 100644
--- a/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusListCredentialStorageService.kt
+++ b/src/main/kotlin/id/walt/signatory/revocation/statuslist2021/StatusListCredentialStorageService.kt
@@ -6,11 +6,9 @@ import id.walt.credentials.w3c.W3CCredentialSubject
 import id.walt.credentials.w3c.builder.W3CCredentialBuilder
 import id.walt.credentials.w3c.templates.VcTemplateService
 import id.walt.credentials.w3c.toVerifiableCredential
-import id.walt.model.DidMethod
 import id.walt.servicematrix.ServiceProvider
 import id.walt.services.WaltIdService
 import id.walt.services.WaltIdServices
-import id.walt.services.did.DidService
 import id.walt.signatory.ProofConfig
 import id.walt.signatory.ProofType
 import id.walt.signatory.Signatory