diff --git a/src/Common/hooks/useFilters.tsx b/src/Common/hooks/useFilters.tsx
index a59b8e1e00..c0919be9ac 100644
--- a/src/Common/hooks/useFilters.tsx
+++ b/src/Common/hooks/useFilters.tsx
@@ -184,13 +184,17 @@ export default function useFilters({
       return acc;
     }, [] as string[]);
 
+    const show = activeFilters.length > 0 || children;
+
     return (
-      <div className="col-span-3 my-2 flex w-full flex-wrap items-center gap-2">
+      <div
+        className={`col-span-3 my-2 flex w-full flex-wrap items-center gap-2 ${show ? "" : "hidden"}`}
+      >
         {compiledBadges.map((props) => (
           <FilterBadge {...props} name={t(props.name)} key={props.name} />
         ))}
         {children}
-        {(activeFilters.length >= 1 || children) && (
+        {show && (
           <button
             id="clear-all-filters"
             className="rounded-full border border-secondary-300 bg-white px-2 py-1 text-xs text-secondary-600 hover:text-secondary-800"
diff --git a/src/Components/Facility/DischargedPatientsList.tsx b/src/Components/Facility/DischargedPatientsList.tsx
index e1f18d778e..5d7a3c2975 100644
--- a/src/Components/Facility/DischargedPatientsList.tsx
+++ b/src/Components/Facility/DischargedPatientsList.tsx
@@ -8,6 +8,7 @@ import useQuery from "../../Utils/request/useQuery";
 import SearchInput from "../Form/SearchInput";
 import {
   ADMITTED_TO,
+  CONSENT_TYPE_CHOICES,
   DISCHARGED_PATIENT_SORT_OPTIONS,
   DISCHARGE_REASONS,
   GENDER_TYPES,
@@ -160,6 +161,39 @@ const DischargedPatientsList = ({
       });
   };
 
+  const HasConsentTypesBadges = () => {
+    const badge = (key: string, value: any, id: string) => {
+      return (
+        value && (
+          <FilterBadge
+            name={key}
+            value={value}
+            onRemove={() => {
+              const lcat = qParams.last_consultation__consent_types
+                .split(",")
+                .filter((x: string) => x != id)
+                .join(",");
+              updateQuery({
+                ...qParams,
+                last_consultation__consent_types: lcat,
+              });
+            }}
+          />
+        )
+      );
+    };
+
+    return qParams.last_consultation__consent_types
+      .split(",")
+      .map((id: string) => {
+        const text = [
+          ...CONSENT_TYPE_CHOICES,
+          { id: "None", text: "No Consents" },
+        ].find((obj) => obj.id == id)?.text;
+        return badge("Has Consent", text, id);
+      });
+  };
+
   const queryField = <T,>(name: string, defaultValue?: T) => {
     return {
       name,
@@ -385,8 +419,12 @@ const DischargedPatientsList = ({
             ),
           ]}
           children={
-            qParams.last_consultation_admitted_bed_type_list &&
-            LastAdmittedToTypeBadges()
+            <>
+              {qParams.last_consultation_admitted_bed_type_list &&
+                LastAdmittedToTypeBadges()}
+              {qParams.last_consultation__consent_types &&
+                HasConsentTypesBadges()}
+            </>
           }
         />
       </div>
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 74a0d4a0f2..f978467616 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -12,7 +12,11 @@ import { InvestigationType } from "../Common/prescription-builder/InvestigationB
 import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
 import { ConsultationDiagnosis, CreateDiagnosis } from "../Diagnosis/types";
 import { NormalPrescription, PRNPrescription } from "../Medicine/models";
-import { AssignedToObjectModel, DailyRoundsModel } from "../Patient/models";
+import {
+  AssignedToObjectModel,
+  DailyRoundsModel,
+  FileUploadModel,
+} from "../Patient/models";
 import { EncounterSymptom } from "../Symptoms/types";
 import { UserBareMinimum } from "../Users/models";
 
@@ -105,6 +109,7 @@ export interface PatientConsentModel {
   patient_code_status:
     | (typeof CONSENT_PATIENT_CODE_STATUS_CHOICES)[number]["id"]
     | null;
+  files: FileUploadModel[] | null;
   archived: boolean;
   archived_by?: UserBareMinimum;
   archived_date: string;
@@ -180,6 +185,7 @@ export interface ConsultationModel {
   is_readmission?: boolean;
   medico_legal_case?: boolean;
   investigation?: InvestigationType[];
+  has_consents?: (typeof CONSENT_TYPE_CHOICES)[number]["id"][];
 }
 
 export interface PatientStatsModel {
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index dbd263463d..b6fc98935e 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -2,6 +2,7 @@ import * as Notification from "../../Utils/Notifications.js";
 
 import {
   ADMITTED_TO,
+  CONSENT_TYPE_CHOICES,
   DISCHARGE_REASONS,
   GENDER_TYPES,
   PATIENT_CATEGORIES,
@@ -195,6 +196,8 @@ export const PatientManager = () => {
       qParams.last_consultation_discharge_date_after || undefined,
     last_consultation_admitted_bed_type_list:
       qParams.last_consultation_admitted_bed_type_list || undefined,
+    last_consultation__consent_types:
+      qParams.last_consultation__consent_types || undefined,
     last_consultation__new_discharge_reason:
       qParams.last_consultation__new_discharge_reason || undefined,
     last_consultation_current_bed__location:
@@ -396,6 +399,17 @@ export const PatientManager = () => {
     },
   );
 
+  const { data: patientsWithNoConsentsData } = useQuery(routes.patientList, {
+    query: {
+      ...qParams,
+      limit: 1,
+      last_consultation__consent_types: "None",
+      is_active: "True",
+    },
+  });
+
+  const patientsWithNoConsents = patientsWithNoConsentsData?.count;
+
   const { data: permittedFacilities } = useQuery(
     routes.getPermittedFacilities,
     {
@@ -432,6 +446,39 @@ export const PatientManager = () => {
       });
   };
 
+  const HasConsentTypesBadges = () => {
+    const badge = (key: string, value: any, id: string) => {
+      return (
+        value && (
+          <FilterBadge
+            name={key}
+            value={value}
+            onRemove={() => {
+              const lcat = qParams.last_consultation__consent_types
+                .split(",")
+                .filter((x: string) => x != id)
+                .join(",");
+              updateQuery({
+                ...qParams,
+                last_consultation__consent_types: lcat,
+              });
+            }}
+          />
+        )
+      );
+    };
+
+    return qParams.last_consultation__consent_types
+      .split(",")
+      .map((id: string) => {
+        const text = [
+          ...CONSENT_TYPE_CHOICES,
+          { id: "None", text: "No Consents" },
+        ].find((obj) => obj.id == id)?.text;
+        return badge("Has Consent", text, id);
+      });
+  };
+
   const getDiagnosisFilterValue = (key: DiagnosesFilterKey) => {
     const ids: string[] = (qParams[key] ?? "").split(",");
     return ids.map((id) => diagnoses.find((obj) => obj.id == id)?.label ?? id);
@@ -660,6 +707,20 @@ export const PatientManager = () => {
                         </span>
                       </span>
                     )}
+                  {!!patient.last_consultation?.has_consents.length || (
+                    <span className="relative inline-flex">
+                      <Chip
+                        size="small"
+                        variant="danger"
+                        startIcon="l-file"
+                        text="No consents recorded"
+                      />
+                      <span className="absolute -right-1 -top-1 flex h-3 w-3 items-center justify-center">
+                        <span className="center absolute inline-flex h-4 w-4 animate-ping rounded-full bg-red-400"></span>
+                        <span className="relative inline-flex h-3 w-3 rounded-full bg-red-600"></span>
+                      </span>
+                    </span>
+                  )}
                 </div>
               </div>
             </div>
@@ -949,7 +1010,25 @@ export const PatientManager = () => {
           </div>
         </div>
       </div>
-      <div className="col-span-3 mt-6 flex flex-wrap">
+      {!qParams.last_consultation__consent_types &&
+        (patientsWithNoConsents || 0) > 0 && (
+          <div className="flex w-full items-center gap-4 rounded-lg bg-red-500/10 p-4 text-sm text-red-500">
+            <CareIcon icon="l-info-circle" className="text-xl" />
+            <p className="font-semibold">
+              {patientsWithNoConsents} patients admitted missing consent
+              records&nbsp;
+              <button
+                onClick={() =>
+                  updateQuery({ last_consultation__consent_types: "None" })
+                }
+                className="underline"
+              >
+                Click to view
+              </button>
+            </p>
+          </div>
+        )}
+      <div className="col-span-3 flex flex-wrap">
         <FilterBadges
           badges={({
             badge,
@@ -1056,8 +1135,15 @@ export const PatientManager = () => {
             ),
           ]}
           children={
-            qParams.last_consultation_admitted_bed_type_list &&
-            LastAdmittedToTypeBadges()
+            (qParams.last_consultation_admitted_bed_type_list ||
+              qParams.last_consultation__consent_types) && (
+              <>
+                {qParams.last_consultation_admitted_bed_type_list &&
+                  LastAdmittedToTypeBadges()}
+                {qParams.last_consultation__consent_types &&
+                  HasConsentTypesBadges()}
+              </>
+            )
           }
         />
       </div>
diff --git a/src/Components/Patient/PatientConsentRecords.tsx b/src/Components/Patient/PatientConsentRecords.tsx
index 7faf670219..a8b94f2d04 100644
--- a/src/Components/Patient/PatientConsentRecords.tsx
+++ b/src/Components/Patient/PatientConsentRecords.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import {
   CONSENT_PATIENT_CODE_STATUS_CHOICES,
   CONSENT_TYPE_CHOICES,
@@ -34,12 +34,6 @@ export default function PatientConsentRecords(props: {
     patient_code_status: 4,
   });
 
-  const refetchAll = () => {
-    refetch();
-    refetchFiles();
-    refetchArchivedFiles();
-  };
-
   const fileUpload = useFileUpload({
     type: "CONSENT_RECORD",
     allowedExtensions: ["pdf", "jpg", "jpeg", "png"],
@@ -48,10 +42,10 @@ export default function PatientConsentRecords(props: {
   const fileManager = useFileManager({
     type: "CONSENT_RECORD",
     onArchive: async () => {
-      refetchAll();
+      refetch();
     },
     onEdit: async () => {
-      refetchAll();
+      refetch();
     },
   });
 
@@ -73,36 +67,6 @@ export default function PatientConsentRecords(props: {
 
   const consentRecords = consentRecordsData?.results;
 
-  const { data: unarchivedFiles, refetch: refetchFiles } = useQuery(
-    routes.viewUpload,
-    {
-      query: {
-        file_type: "CONSENT_RECORD",
-        associating_id: consentRecords?.map((cr) => cr.id).join(","),
-        limit: 1000,
-        offset: 0,
-        is_archived: false,
-      },
-      prefetch: (consentRecords?.length || 0) > 0 && showArchived,
-    },
-  );
-
-  const { data: archivedFiles, refetch: refetchArchivedFiles } = useQuery(
-    routes.viewUpload,
-    {
-      query: {
-        file_type: "CONSENT_RECORD",
-        associating_id: consentRecords?.map((cr) => cr.id).join(","),
-        limit: 1000,
-        offset: 0,
-        is_archived: true,
-      },
-      prefetch: (consentRecords?.length || 0) > 0 && !showArchived,
-    },
-  );
-
-  const files = showArchived ? archivedFiles : unarchivedFiles;
-
   const selectField = (name: string) => {
     return {
       name,
@@ -135,13 +99,6 @@ export default function PatientConsentRecords(props: {
     refetch();
   };
 
-  useEffect(() => {
-    if (consentRecords && consentRecords.length > 0) {
-      refetchFiles();
-      refetchArchivedFiles();
-    }
-  }, [consentRecords]);
-
   return (
     <Page
       title={"Patient Consent Records"}
@@ -280,13 +237,15 @@ export default function PatientConsentRecords(props: {
         <div className="flex-1">
           {consentRecords?.filter(
             (r) =>
-              files?.results.filter((f) => f.associating_id === r.id).length,
+              r.files?.filter(
+                (f) =>
+                  f.associating_id === r.id && f.is_archived === showArchived,
+              ).length,
           ).length === 0 ? (
             <div className="flex h-32 items-center justify-center text-secondary-500">
               No consent records found
             </div>
           ) : (
-            (!unarchivedFiles || !archivedFiles) &&
             !consentRecords && (
               <div className="skeleton-animate-alpha h-32 rounded-lg" />
             )
@@ -301,8 +260,10 @@ export default function PatientConsentRecords(props: {
                 archiveFile={fileManager.archiveFile}
                 editFile={fileManager.editFile}
                 showArchive={showArchived}
-                files={files?.results.filter(
-                  (f) => f.associating_id === record.id,
+                files={record.files?.filter(
+                  (f) =>
+                    f.associating_id === record.id &&
+                    showArchived === f.is_archived,
                 )}
               />
             ))}
diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
index f153f9aa93..b69436171d 100644
--- a/src/Components/Patient/PatientFilter.tsx
+++ b/src/Components/Patient/PatientFilter.tsx
@@ -3,6 +3,7 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
 import FiltersSlideover from "../../CAREUI/interactive/FiltersSlideover";
 import {
   ADMITTED_TO,
+  CONSENT_TYPE_CHOICES,
   DISCHARGE_REASONS,
   FACILITY_TYPES,
   GENDER_TYPES,
@@ -78,6 +79,7 @@ export default function PatientFilter(props: any) {
       filter.last_consultation_admitted_bed_type_list
         ? filter.last_consultation_admitted_bed_type_list.split(",")
         : [],
+    last_consultation__consent_types: filter.last_consultation__consent_types,
     last_consultation_current_bed__location:
       filter.last_consultation_current_bed__location || "",
     last_consultation__new_discharge_reason:
@@ -183,6 +185,7 @@ export default function PatientFilter(props: any) {
       last_consultation_discharge_date_before,
       last_consultation_discharge_date_after,
       last_consultation_admitted_bed_type_list,
+      last_consultation__consent_types,
       last_consultation__new_discharge_reason,
       last_consultation_current_bed__location,
       number_of_doses,
@@ -241,6 +244,7 @@ export default function PatientFilter(props: any) {
       age_max: age_max || "",
       last_consultation_admitted_bed_type_list:
         last_consultation_admitted_bed_type_list || [],
+      last_consultation__consent_types: last_consultation__consent_types,
       last_consultation__new_discharge_reason:
         last_consultation__new_discharge_reason || "",
       number_of_doses: number_of_doses || "",
@@ -373,6 +377,26 @@ export default function PatientFilter(props: any) {
               />
             </div>
           )}
+          <div className="w-full flex-none" id="consent-type-select">
+            <FieldLabel className="text-sm">Has consent records for</FieldLabel>
+            <MultiSelectMenuV2
+              id="last_consultation__consent_types"
+              placeholder="Select consent types"
+              options={[
+                ...CONSENT_TYPE_CHOICES,
+                { id: "None", text: "No consents" },
+              ]}
+              value={filterState.last_consultation__consent_types}
+              optionValue={(o) => o.id}
+              optionLabel={(o) => o.text}
+              onChange={(o) =>
+                setFilterState({
+                  ...filterState,
+                  last_consultation__consent_types: o,
+                })
+              }
+            />
+          </div>
           {(props.dischargePage ||
             ["StateAdmin", "StateReadOnlyAdmin"].includes(
               authUser.user_type,
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index 66545447e7..f58af22842 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -133,29 +133,6 @@ export default function PatientInfoCard(props: {
     },
     prefetch: !!consultation?.treating_physician_object?.username,
   });
-  const { data: consentRecords, loading: consentRecordsLoading } = useQuery(
-    routes.listConsents,
-    {
-      pathParams: {
-        consultationId: consultation?.id ?? "",
-      },
-      prefetch: !!consultation?.id,
-    },
-  );
-
-  const { data: consentFiles, loading: consentFilesLoading } = useQuery(
-    routes.viewUpload,
-    {
-      query: {
-        file_type: "CONSENT_RECORD",
-        associating_id: consentRecords?.results.map((cr) => cr.id).join(","),
-        limit: 1,
-        offset: 0,
-        is_archived: false,
-      },
-      prefetch: (consentRecords?.results.length || 0) > 0,
-    },
-  );
 
   return (
     <>
@@ -371,18 +348,15 @@ export default function PatientInfoCard(props: {
                         </div>
                       </div>
                     )}
-                  {!consentFilesLoading &&
-                    !consentRecordsLoading &&
-                    !consentFiles?.results.filter((c) => !c.is_archived)
-                      .length && (
-                      <div>
-                        <div className="inline-flex w-full items-center justify-start rounded border border-red-600 bg-red-400 p-1 px-3 text-xs font-semibold leading-4">
-                          <span className="font-semibold text-white">
-                            Consent Records Missing
-                          </span>
-                        </div>
+                  {!!consultation?.has_consents?.length || (
+                    <div>
+                      <div className="inline-flex w-full items-center justify-start rounded border border-red-600 bg-red-400 p-1 px-3 text-xs font-semibold leading-4">
+                        <span className="font-semibold text-white">
+                          Consent Records Missing
+                        </span>
                       </div>
-                    )}
+                    </div>
+                  )}
                   {consultation?.suggestion === "DC" && (
                     <div>
                       <div>