diff --git a/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java b/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java
index 9a663148..5577df93 100644
--- a/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java
+++ b/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java
@@ -173,9 +173,11 @@ public VerifiableCredential build() {
     map.put(VerifiableCredential.ID, id.toString());
     map.put(VerifiableCredential.TYPE, types);
     map.put(VerifiableCredential.ISSUER, issuer.toString());
-    map.put(VerifiableCredential.ISSUANCE_DATE, formatter.format(issuanceDate));
-    map.put(VerifiableCredential.EXPIRATION_DATE, formatter.format(expirationDate));
     map.put(VerifiableCredential.CREDENTIAL_SUBJECT, credentialSubject);
+    map.put(VerifiableCredential.ISSUANCE_DATE, formatter.format(issuanceDate));
+    if (expirationDate != null) {
+      map.put(VerifiableCredential.EXPIRATION_DATE, formatter.format(expirationDate));
+    }
     if (proof != null) {
       map.put(VerifiableCredential.PROOF, proof);
     }