diff --git a/api/src/main/java/ca/bc/gov/educ/api/graduation/service/GraduationService.java b/api/src/main/java/ca/bc/gov/educ/api/graduation/service/GraduationService.java
index a51ad91c..6efe8c96 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/graduation/service/GraduationService.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/graduation/service/GraduationService.java
@@ -301,16 +301,20 @@ private List<GraduationStudentRecord> filterStudentList(List<GraduationStudentRe
     }
 
     private int processGradRegReport(School schoolObj, List<Student> stdList, String mincode, String accessToken, int numberOfReports) {
-        ReportData gradReport = getReportDataObj(schoolObj, stdList);
-        createAndSaveSchoolReportGradRegReport(gradReport, mincode, accessToken);
-        numberOfReports++;
+        if(stdList != null && !stdList.isEmpty()) {
+            ReportData gradReport = getReportDataObj(schoolObj, stdList);
+            createAndSaveSchoolReportGradRegReport(gradReport, mincode, accessToken);
+            numberOfReports++;
+        }
         return numberOfReports;
     }
 
     private int processNonGradRegReport(School schoolObj, List<Student> stdList, String mincode, String accessToken, int numberOfReports) {
-        ReportData gradReport = getReportDataObj(schoolObj, stdList);
-        createAndSaveSchoolReportNonGradRegReport(gradReport, mincode, accessToken);
-        numberOfReports++;
+        if(stdList != null && !stdList.isEmpty()) {
+            ReportData gradReport = getReportDataObj(schoolObj, stdList);
+            createAndSaveSchoolReportNonGradRegReport(gradReport, mincode, accessToken);
+            numberOfReports++;
+        }
         return numberOfReports;
     }
 
@@ -324,20 +328,14 @@ private ReportData getReportDataObj(School schoolObj, List<Student> stdList) {
     }
 
     private int processStudentNonGradPrjReport(School schoolObj, List<Student> stdList, String mincode, String accessToken, int numberOfReports) {
-        ReportData nongradProjected = getReportDataObj(schoolObj, stdList);
-        createAndSaveSchoolReportStudentNonGradPrjReport(nongradProjected, mincode, accessToken);
-        numberOfReports++;
+        if(stdList != null && !stdList.isEmpty()) {
+            ReportData nongradProjected = getReportDataObj(schoolObj, stdList);
+            createAndSaveSchoolReportStudentNonGradPrjReport(nongradProjected, mincode, accessToken);
+            numberOfReports++;
+        }
         return numberOfReports;
     }
 
-    /**
-    private int processStudentNonGradReport(School schoolObj, List<Student> stdList, String mincode, String accessToken, int numberOfReports) {
-        ReportData nongradProjected = getReportDataObj(schoolObj, stdList);
-        createAndSaveSchoolReportStudentNonGradReport(nongradProjected, mincode, accessToken);
-        numberOfReports++;
-        return numberOfReports;
-    }**/
-
     @SneakyThrows
     private List<Student> processStudentList(List<GraduationStudentRecord> gradStudList, String type) {
         List<Student> stdPrjList = new ArrayList<>();
diff --git a/api/src/test/java/ca/bc/gov/educ/api/graduation/service/GraduationServiceTest.java b/api/src/test/java/ca/bc/gov/educ/api/graduation/service/GraduationServiceTest.java
index 55f54e74..8fb209f0 100644
--- a/api/src/test/java/ca/bc/gov/educ/api/graduation/service/GraduationServiceTest.java
+++ b/api/src/test/java/ca/bc/gov/educ/api/graduation/service/GraduationServiceTest.java
@@ -13,12 +13,10 @@
 import org.junit.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
@@ -2040,7 +2038,7 @@ public void testCreateAndStoreSchoolReports() {
 		Mockito.when(gradStatusService.getStudentListByMinCode(mincode, "accessToken")).thenReturn(sList);
 		Mockito.when(schoolService.getTraxSchoolDetails(mincode, "accessToken", exception)).thenReturn(sTrax);
 		int numberOfRecord = graduationService.createAndStoreSchoolReports(uniqueList,"REGALG","accessToken");
-		assertEquals(2,numberOfRecord);
+		assertEquals(1,numberOfRecord);
 	}
 
 	@Test