diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dao/CertificateTypeCodeRepository.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dao/CertificateTypeCodeRepository.java
index 5ba22208..11b70717 100644
--- a/api/src/main/java/ca/bc/gov/educ/grad/report/dao/CertificateTypeCodeRepository.java
+++ b/api/src/main/java/ca/bc/gov/educ/grad/report/dao/CertificateTypeCodeRepository.java
@@ -14,4 +14,7 @@ public interface CertificateTypeCodeRepository extends JpaRepository<Certificate
 
     @Query("select t from CertificateTypeCodeEntity t join StudentCertificateEntity c on t.certificateTypeCode = c.certificateTypeCode where c.documentStatusCode='COMPL' and c.graduationStudentRecordId=:graduationStudentRecordId")
     List<CertificateTypeCodeEntity> getStudentCertificateTypes(UUID graduationStudentRecordId);
+
+    @Query("select t from CertificateTypeCodeEntity t join StudentCertificateEntity c on t.certificateTypeCode = c.certificateTypeCode where c.documentStatusCode='COMPL' and c.graduationStudentRecordId=:graduationStudentRecordId and c.certificateTypeCode in (:certificateTypeCode)")
+    List<CertificateTypeCodeEntity> getStudentCertificateTypes(UUID graduationStudentRecordId, List<String> certificateTypeCode);
 }
\ No newline at end of file
diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dao/GradDataConvertionBean.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dao/GradDataConvertionBean.java
index b2f0353e..a2a9bc9c 100644
--- a/api/src/main/java/ca/bc/gov/educ/grad/report/dao/GradDataConvertionBean.java
+++ b/api/src/main/java/ca/bc/gov/educ/grad/report/dao/GradDataConvertionBean.java
@@ -488,7 +488,19 @@ public Pair<List<Student>, TotalCounts> getStudents(ReportData reportData) {
                 Optional<Date> distributionDate = studentCertificateRepository.getCertificateDistributionDate(UUID.fromString(pen.getEntityId()));
                 distributionDate.ifPresent(student::setCertificateDistributionDate);
 
-                List<CertificateTypeCodeEntity> certificateTypes = certificateTypeCodeRepository.getStudentCertificateTypes(UUID.fromString(pen.getEntityId()));
+                List<String> studentCertificateTypeCodes = new ArrayList<>();
+                if(st.getGraduationStatus() != null && StringUtils.isNotBlank(st.getGraduationStatus().getCertificates())) {
+                    String studentCertificateTypeCodesString = st.getGraduationStatus().getCertificates();
+                    log.debug("Process student {} certificate credentials {}", student.getPen(), studentCertificateTypeCodesString);
+                    studentCertificateTypeCodes = Arrays.asList(StringUtils.split(studentCertificateTypeCodesString, ","));
+                }
+
+                List<CertificateTypeCodeEntity> certificateTypes;
+                if(!studentCertificateTypeCodes.isEmpty()) {
+                    certificateTypes = certificateTypeCodeRepository.getStudentCertificateTypes(UUID.fromString(pen.getEntityId()), studentCertificateTypeCodes);
+                } else {
+                    certificateTypes = certificateTypeCodeRepository.getStudentCertificateTypes(UUID.fromString(pen.getEntityId()));
+                }
                 student.setCertificateTypes(certificateTypes.stream().map(CertificateTypeCodeEntity::getLabel).collect(Collectors.toList()));
                 totals.countCertificate(certificateTypes.size());