diff --git a/contracts/contracts/libraries/CustomVerifier.sol b/contracts/contracts/libraries/CustomVerifier.sol
index 9e6d3cd2c..d1f11597e 100644
--- a/contracts/contracts/libraries/CustomVerifier.sol
+++ b/contracts/contracts/libraries/CustomVerifier.sol
@@ -346,7 +346,7 @@ library CustomVerifier {
             userIdentifier: kycOutput.userIdentifier,
             nullifier: kycOutput.nullifier,
             forbiddenCountriesListPacked: kycOutput.forbiddenCountriesListPacked,
-            issuingState: "UNAVAILABLE",
+            issuingState: CircuitAttributeHandlerV2.getIssuingState(AttestationId.KYC, kycOutput.revealedDataPacked),
             name: CircuitAttributeHandlerV2.getName(AttestationId.KYC, kycOutput.revealedDataPacked),
             idNumber: CircuitAttributeHandlerV2.getDocumentNumber(AttestationId.KYC, kycOutput.revealedDataPacked),
             nationality: CircuitAttributeHandlerV2.getNationality(AttestationId.KYC, kycOutput.revealedDataPacked),
diff --git a/sdk/core/src/utils/id.ts b/sdk/core/src/utils/id.ts
index 2956c7dae..25a67e8cf 100644
--- a/sdk/core/src/utils/id.ts
+++ b/sdk/core/src/utils/id.ts
@@ -25,16 +25,12 @@ export const formatRevealedDataPacked = (
   );
   let issuingState = '';
 
-  if (attestationId === 4) {
-    issuingState = 'UNAVAILABLE';
-  } else {
-    issuingState = revealedDataPackedString
-      .subarray(
-        revealedDataIndices[attestationId].issuingStateStart,
-        revealedDataIndices[attestationId].issuingStateEnd + 1
-      )
-      .toString('utf-8');
-  }
+  issuingState = revealedDataPackedString
+    .subarray(
+      revealedDataIndices[attestationId].issuingStateStart,
+      revealedDataIndices[attestationId].issuingStateEnd + 1
+    )
+    .toString('utf-8');
 
   const name = revealedDataPackedString
     .subarray(