diff --git a/onboarding/static/dashboard/onboardChart.js b/onboarding/static/dashboard/onboardChart.js
index b24894285..27c45a859 100644
--- a/onboarding/static/dashboard/onboardChart.js
+++ b/onboarding/static/dashboard/onboardChart.js
@@ -1,5 +1,21 @@
 $(document).ready(function () {
 	//Hired candididates recruitment wise chart
+	function isChartEmpty(chartData) {
+		if (!chartData) {
+			return true;
+		}
+		for (let i = 0; i < chartData.length; i++) {
+			
+			if (chartData[i]) {
+				const hasNonZeroValues = chartData.some((value) => value !== 0);
+				if (hasNonZeroValues) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
 	$.ajax({
 		type: "GET",
 		url: "/onboarding/hired-candidate-chart",
diff --git a/pms/static/src/dashboard/pmsChart.js b/pms/static/src/dashboard/pmsChart.js
index 60f2597a4..ecf6bec62 100644
--- a/pms/static/src/dashboard/pmsChart.js
+++ b/pms/static/src/dashboard/pmsChart.js
@@ -12,18 +12,19 @@ var objectiveStatusData = {
 	],
 };
 function isChartEmpty(chartData) {
-    if (!chartData) {
-        return true; 
-    }
-    for (let i = 0; i < chartData.length; i++) {
-        if (chartData[i] && chartData[i].data) {
-            const hasNonZeroValues = chartData[i].data.some((value) => value !== 0);
-            if (hasNonZeroValues) {
-                return false;
-            }
-        }
-    }
-    return true;
+	if (!chartData) {
+		return true;
+	}
+	for (let i = 0; i < chartData.length; i++) {
+		
+		if (chartData[i]) {
+			const hasNonZeroValues = chartData.some((value) => value !== 0);
+			if (hasNonZeroValues) {
+				return false;
+			}
+		}
+	}
+	return true;
 }
 
 // chart constructor
@@ -73,7 +74,7 @@ $.ajax({
 		"X-Requested-With": "XMLHttpRequest",
 	},
 	success: (response) => {
-		if (isChartEmpty(response.data)) {
+		if (isChartEmpty(response.objective_value)) {
 			$("#objectiveChart")
 				.parent()
 				.html(
@@ -174,7 +175,7 @@ $.ajax({
 		"X-Requested-With": "XMLHttpRequest",
 	},
 	success: (response) => {
-		if (isChartEmpty(response.data)) {
+		if (isChartEmpty(response.key_result_value)) {
 			$("#keyResultChart")
 				.parent()
 				.html(
@@ -274,7 +275,7 @@ $.ajax({
 		"X-Requested-With": "XMLHttpRequest",
 	},
 	success: (response) => {
-		if (isChartEmpty(response.data)) {
+		if (isChartEmpty(response.feedback_value)) {
 			$("#feedbackChart")
 				.parent()
 				.html(