diff --git a/src/Locale/en.json b/src/Locale/en.json
index 9826b7532fa..1d9f5cfe4ae 100644
--- a/src/Locale/en.json
+++ b/src/Locale/en.json
@@ -379,6 +379,7 @@
   "checking_eligibility": "Checking Eligibility",
   "checking_for_update": "Checking for update",
   "checking_policy_eligibility": "Checking Policy Eligibility",
+  "choose_date_time": "Choose Date and Time",
   "choose_file": "Upload From Device",
   "choose_location": "Choose Location",
   "claim__add_item": "Add Item",
diff --git a/src/components/Facility/ConsultationDetails/index.tsx b/src/components/Facility/ConsultationDetails/index.tsx
index 6a4dba966c4..148411a6e06 100644
--- a/src/components/Facility/ConsultationDetails/index.tsx
+++ b/src/components/Facility/ConsultationDetails/index.tsx
@@ -76,7 +76,7 @@ export const ConsultationDetails = (props: any) => {
   }
   const [showDoctors, setShowDoctors] = useState(false);
   const [qParams, _] = useQueryParams();
-  const [patientData, setPatientData] = useState<PatientModel>({});
+  const [patientData, setPatientData] = useState<PatientModel>();
   const [abhaNumberData, setAbhaNumberData] = useState<AbhaNumberModel>();
   const [activeShiftingData, setActiveShiftingData] = useState<Array<any>>([]);
 
@@ -135,7 +135,7 @@ export const ConsultationDetails = (props: any) => {
         address: getPatientAddress(data),
         comorbidities: getPatientComorbidities(data),
         is_declared_positive: data.is_declared_positive ? "Yes" : "No",
-        is_vaccinated: patientData.is_vaccinated ? "Yes" : "No",
+        is_vaccinated: patientData?.is_vaccinated ? "Yes" : "No",
       } as any);
     },
   });
@@ -160,7 +160,7 @@ export const ConsultationDetails = (props: any) => {
         setActiveShiftingData(shiftRequestsQuery.data.results);
       }
     },
-    [consultationId, patientData.is_vaccinated],
+    [consultationId, patientData?.is_vaccinated],
   );
 
   useEffect(() => {
@@ -176,7 +176,7 @@ export const ConsultationDetails = (props: any) => {
     });
   }, [patientDataQuery.data?.id]);
 
-  if (!consultationData || patientDataQuery.loading) {
+  if (!patientData || !consultationData || patientDataQuery.loading) {
     return <Loading />;
   }
 
diff --git a/src/components/Facility/Consultations/PainDiagrams.tsx b/src/components/Facility/Consultations/PainDiagrams.tsx
index 2b73fe978ad..c5c6d06864f 100644
--- a/src/components/Facility/Consultations/PainDiagrams.tsx
+++ b/src/components/Facility/Consultations/PainDiagrams.tsx
@@ -1,57 +1,41 @@
 import { useEffect, useState } from "react";
-import routes from "../../../Redux/api";
-import request from "../../../Utils/request/request";
 import { formatDateTime } from "../../../Utils/utils";
 import PainChart from "../../LogUpdate/components/PainChart";
-import { PainDiagramsFields } from "../models";
+import { useTranslation } from "react-i18next";
 
 export const PainDiagrams = (props: any) => {
-  const { consultationId } = props;
-  const [isLoading, setIsLoading] = useState(false);
-  const [results, setResults] = useState<any>({});
-  const [selectedData, setData] = useState<any>({
+  const { dailyRound } = props;
+  const [results, setResults] = useState({});
+  const [selectedData, setData] = useState({
     data: [],
     id: "",
   });
+  const { t } = useTranslation();
 
   useEffect(() => {
-    const fetchDailyRounds = async (consultationId: string) => {
-      setIsLoading(true);
-      const { res, data: dailyRound } = await request(
-        routes.dailyRoundsAnalyse,
-        {
-          body: { fields: PainDiagramsFields },
-          pathParams: {
-            consultationId,
-          },
-        },
-      );
-      if (res && res.ok && dailyRound?.results) {
-        const keys = Object.keys(dailyRound.results || {}).filter(
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          (key) => dailyRound.results[key].pain_scale_enhanced.length,
+    const filterDailyRounds = () => {
+      if (dailyRound) {
+        const keys = Object.keys(dailyRound || {}).filter(
+          (key) => dailyRound[key].pain_scale_enhanced.length,
         );
         const data: any = {};
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        keys.forEach((key) => (data[key] = dailyRound.results[key]));
+        keys.forEach(
+          (key) =>
+            (data[key] = Object.assign(
+              {},
+              { pain_scale_enhanced: dailyRound[key].pain_scale_enhanced },
+            )),
+        );
 
         setResults(data);
         if (keys.length > 0) {
           setSelectedDateData(data, keys[0]);
         }
       }
-      setIsLoading(false);
     };
 
-    fetchDailyRounds(consultationId);
-  }, [consultationId]);
-
-  useEffect(() => {
-    if (Object.keys(results).length > 0)
-      setSelectedDateData(results, Object.keys(results)[0]);
-  }, [results]);
+    filterDailyRounds();
+  }, [dailyRound]);
 
   useEffect(() => {
     if (Object.keys(results).length > 0)
@@ -73,7 +57,7 @@ export const PainDiagrams = (props: any) => {
   const dropdown = (dates: Array<any>) => {
     return dates && dates.length > 0 ? (
       <div className="mx-auto flex flex-wrap">
-        <div className="p-2">Choose Date and Time</div>
+        <div className="p-2">{t("choose_date_time")}</div>
         <select
           title="date"
           className="relative rounded border-secondary-200 bg-white py-2 pl-3 pr-8 text-slate-600 shadow outline-none focus:border-secondary-300 focus:outline-none focus:ring-1 focus:ring-secondary-300"
@@ -97,7 +81,7 @@ export const PainDiagrams = (props: any) => {
           className="border-2 border-secondary-400 py-2 pl-3 pr-8"
           disabled={true}
         >
-          <option>No Data Found</option>
+          <option>{t("no_data_found")}</option>
         </select>
       </div>
     );
@@ -106,7 +90,7 @@ export const PainDiagrams = (props: any) => {
   return (
     <div className="space-y-4">
       {dates && dropdown(dates)}
-      {!isLoading && selectedData.data ? (
+      {selectedData.data ? (
         <PainChart pain={selectedData.data} />
       ) : (
         <div className="h-screen" />
diff --git a/src/components/Facility/Consultations/PrimaryParametersPlot.tsx b/src/components/Facility/Consultations/PrimaryParametersPlot.tsx
index eb831127773..067e197e374 100644
--- a/src/components/Facility/Consultations/PrimaryParametersPlot.tsx
+++ b/src/components/Facility/Consultations/PrimaryParametersPlot.tsx
@@ -255,7 +255,7 @@ export const PrimaryParametersPlot = ({
       </div>
       <div>
         <PageTitle title="Pain Scale" hideBack={true} breadcrumbs={false} />
-        <PainDiagrams consultationId={consultationId} />
+        <PainDiagrams dailyRound={results} />
       </div>
       {totalCount > PAGINATION_LIMIT && (
         <div className="mt-4 flex w-full justify-center">
diff --git a/src/components/Facility/models.tsx b/src/components/Facility/models.tsx
index 73473c57c1e..e64bbfda99f 100644
--- a/src/components/Facility/models.tsx
+++ b/src/components/Facility/models.tsx
@@ -449,6 +449,7 @@ export const PrimaryParametersPlotFields = [
   "ventilator_fio2",
   "rhythm",
   "rhythm_detail",
+  "pain_scale_enhanced",
 ] as const satisfies (keyof DailyRoundsModel)[];
 
 export type PrimaryParametersPlotRes = {