diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/SupplyChainValidation.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/SupplyChainValidation.java
index 8c4087fe..ff3b9799 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/SupplyChainValidation.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/SupplyChainValidation.java
@@ -105,8 +105,12 @@ public class SupplyChainValidation extends ArchivableEntity {
         this.certificatesUsed = new ArrayList<>();
         this.rimId = "";
         for (ArchivableEntity ae : certificatesUsed) {
-            if (ae instanceof ReferenceManifest) {
-                this.rimId = ae.getId().toString();
+            if (ae instanceof ReferenceManifest rm) {
+                if (rm.isBase()) {
+                    this.rimId = rm.getId().toString();
+                } else {
+                    this.rimId = rm.getAssociatedRim().toString();
+                }
                 break;
             } else if (ae instanceof Certificate) {
                 this.certificatesUsed.add((Certificate) ae);