diff --git a/src/components/Patient/PatientDetailsTab/EncounterHistory.tsx b/src/components/Patient/PatientDetailsTab/EncounterHistory.tsx
index 7a53b02e0d7..7e3c8d88418 100644
--- a/src/components/Patient/PatientDetailsTab/EncounterHistory.tsx
+++ b/src/components/Patient/PatientDetailsTab/EncounterHistory.tsx
@@ -1,62 +1,95 @@
+import { useQuery } from "@tanstack/react-query";
 import { Link } from "raviger";
 import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
-import PaginatedList from "@/CAREUI/misc/PaginatedList";
 
 import { Button } from "@/components/ui/button";
 
-import CircularProgress from "@/components/Common/CircularProgress";
+import { CardListSkeleton } from "@/components/Common/SkeletonLoading";
 import { EncounterCard } from "@/components/Facility/EncounterCard";
 import { PatientProps } from "@/components/Patient/PatientDetailsTab";
 
+import useFilters from "@/hooks/useFilters";
+
 import routes from "@/Utils/request/api";
-import { Encounter } from "@/types/emr/encounter";
+import query from "@/Utils/request/query";
 
 const EncounterHistory = (props: PatientProps) => {
   const { patientId, facilityId } = props;
 
   const { t } = useTranslation();
 
+  const { qParams, Pagination, resultsPerPage } = useFilters({
+    limit: 15,
+    cacheBlacklist: ["encounterHistory"],
+  });
+
+  const {
+    data: encounterData,
+    isFetching: encountersFetching,
+    isLoading: encountersLoading,
+  } = useQuery({
+    queryKey: ["encountersHistory", patientId, qParams],
+    queryFn: query.debounced(routes.encounter.list, {
+      queryParams: {
+        patient: patientId,
+        limit: 5,
+        offset: ((qParams.page ?? 1) - 1) * resultsPerPage,
+      },
+    }),
+  });
+
   return (
-    <PaginatedList
-      route={routes.encounter.list}
-      queryParams={{ patient: patientId }}
-      perPage={5}
-    >
-      {() => (
-        <div className="mt-8">
-          <PaginatedList.WhenLoading>
-            <CircularProgress />
-          </PaginatedList.WhenLoading>
-          <PaginatedList.WhenEmpty className="py-2">
-            <div className="h-full space-y-2 rounded-lg bg-white px-7 py-12 border border-secondary-300">
-              <div className="flex w-full items-center justify-center text-lg text-secondary-600">
-                {t("no_consultation_history")}
-              </div>
-              <div className="flex w-full items-center justify-center pt-4">
-                <Button variant="outline_primary" asChild>
-                  <Link
-                    href={`/facility/${facilityId}/patient/${patientId}/consultation`}
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-chat-bubble-user" className="text-xl" />
-                      {t("add_consultation")}
-                    </span>
-                  </Link>
-                </Button>
-              </div>
+    <div className="mt-8">
+      <div>
+        {encountersLoading ? (
+          <div>
+            <div className="grid gap-5">
+              <CardListSkeleton count={3} />
             </div>
-          </PaginatedList.WhenEmpty>
-          <PaginatedList.Items<Encounter>>
-            {(encounter) => <EncounterCard encounter={encounter} />}
-          </PaginatedList.Items>
-          <div className="flex w-full items-center justify-center">
-            <PaginatedList.Paginator hideIfSinglePage />
           </div>
-        </div>
-      )}
-    </PaginatedList>
+        ) : (
+          <div>
+            {!encountersFetching && encounterData?.results?.length === 0 ? (
+              <div className="p-2">
+                <div className="h-full space-y-2 rounded-lg bg-white px-7 py-12 border border-secondary-300">
+                  <div className="flex w-full items-center justify-center text-lg text-secondary-600">
+                    {t("no_consultation_history")}
+                  </div>
+                  <div className="flex w-full items-center justify-center pt-4">
+                    <Button variant="outline_primary" asChild>
+                      <Link
+                        href={`/facility/${facilityId}/patient/${patientId}/consultation`}
+                      >
+                        <span className="flex w-full items-center justify-start gap-2">
+                          <CareIcon
+                            icon="l-chat-bubble-user"
+                            className="text-xl"
+                          />
+                          {t("add_consultation")}
+                        </span>
+                      </Link>
+                    </Button>
+                  </div>
+                </div>
+              </div>
+            ) : (
+              <ul className="grid gap-4">
+                {encounterData?.results?.map((encounter) => (
+                  <li key={encounter.id} className="w-full">
+                    <EncounterCard key={encounter.id} encounter={encounter} />
+                  </li>
+                ))}
+                <div className="flex w-full items-center justify-center">
+                  <Pagination totalCount={encounterData?.count || 0} />
+                </div>
+              </ul>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
   );
 };