diff --git a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx index 9e9b462af8b..cb53325fd11 100644 --- a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx +++ b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx @@ -796,6 +796,7 @@ export const AdministrationTab: React.FC = ({ variant="outline" className="text-emerald-600 border-emerald-600 hover:bg-emerald-50 w-full sm:w-auto" onClick={() => setIsSheetOpen(true)} + disabled={!activeMedications?.results.length} > {t("administer_medicine")} @@ -839,7 +840,7 @@ export const AdministrationTab: React.FC = ({ }); } }} - medications={medications} + medications={activeMedications?.results || []} lastAdministeredDates={lastAdministeredDetails?.dates} patientId={patientId} encounterId={encounterId}