diff --git a/data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/service/KpiMaturityCalculationService.java b/data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/service/KpiMaturityCalculationService.java
index e3d5bf2cc..74ea97403 100644
--- a/data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/service/KpiMaturityCalculationService.java
+++ b/data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/service/KpiMaturityCalculationService.java
@@ -219,6 +219,11 @@ private KpiMaturity calculateKpiMaturity(
 										kpiElement.setKpiCategory(
 												kpiIdKpiMasterMap.get(kpiElement.getKpiId()).getKpiCategory()))
 						.collect(Collectors.groupingBy(KpiElement::getKpiCategory));
+		kpisEligibleForMaturityCalculation.stream()
+				.map(KpiMaster::getKpiCategory)
+				.filter(StringUtils::isNotBlank)
+				.distinct()
+				.forEach(category -> kpiElementsGroupedByCategory.putIfAbsent(category, new ArrayList<>()));
 		Map<String, Double> maturityScoreByCategory = new HashMap<>();
 
 		List<MaturityScore> maturityScores = new ArrayList<>();