diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
index ddb3cb83e..5c3a15489 100644
--- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
+++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
@@ -286,6 +286,8 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t
 		previousToDate.add(Calendar.MONTH, -1); 
 		int max = previousToDate.getActualMaximum(Calendar.DAY_OF_MONTH);
 		previousToDate.set(Calendar.DAY_OF_MONTH, max);
+		Map<String, Object> masterMap = mDataService.loadMasterData(requestInfo,
+				tenantId);
 		
 		String assessmentYear = estimationService.getAssessmentYear();
 		ArrayList<String> failedConnectionNos = new ArrayList<String>();
@@ -297,8 +299,6 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t
 			CalculationReq calculationReq = CalculationReq.builder().calculationCriteria(calculationCriteriaList)
 					.requestInfo(requestInfo).isconnectionCalculation(true).isAdvanceCalculation(false).build();
 
-			Map<String, Object> masterMap = mDataService.loadMasterData(calculationReq.getRequestInfo(),
-					calculationReq.getCalculationCriteria().get(0).getTenantId());
 			Set<String> consumerCodes = new LinkedHashSet<String>();
 			consumerCodes.add(connectionNo);