diff --git a/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx b/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
index 55ac81fe16..9ba87ccf88 100644
--- a/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
+++ b/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
@@ -93,7 +93,7 @@ const MedicationsDetailsTable = connect<
             <div>
               <p className={styles.bodyLong01}>
                 <strong>{capitalize(medication.drug?.concept?.display)}</strong> &mdash;{' '}
-                {medication.drug?.strength.toLowerCase()} &mdash; {medication.drug.dosageForm.display.toLowerCase()}
+                {medication.drug?.strength.toLowerCase()} &mdash; {medication.drug?.dosageForm?.display.toLowerCase()}
               </p>
               <p className={styles.bodyLong01}>
                 <span className={styles.label01}>{t('dose', 'Dose').toUpperCase()}</span>{' '}
diff --git a/packages/esm-patient-medications-app/src/order-basket/order-basket.component.tsx b/packages/esm-patient-medications-app/src/order-basket/order-basket.component.tsx
index 7ea6a54063..e7ff3037c3 100644
--- a/packages/esm-patient-medications-app/src/order-basket/order-basket.component.tsx
+++ b/packages/esm-patient-medications-app/src/order-basket/order-basket.component.tsx
@@ -218,7 +218,7 @@ const OrderBasket = connect<OrderBasketProps, OrderBasketStoreActions, OrderBask
               className={styles.button}
               kind="primary"
               onClick={handleSaveClicked}
-              disabled={!items?.length || !encounterUuid}
+              disabled={!patientOrderItems?.length || !encounterUuid}
             >
               {t('signAndClose', 'Sign and close')}
             </Button>
diff --git a/packages/esm-patient-medications-app/translations/en.json b/packages/esm-patient-medications-app/translations/en.json
index 909014ef3c..91f5957800 100644
--- a/packages/esm-patient-medications-app/translations/en.json
+++ b/packages/esm-patient-medications-app/translations/en.json
@@ -40,6 +40,7 @@
   "indicationPlaceholder": "e.g. \"Hypertension\"",
   "medicationDurationAndUnit": "for {duration} {durationUnit}",
   "medicationIndefiniteDuration": "Indefinite duration",
+  "medications": "Medications",
   "modify": "Modify",
   "noDurationHint": "An empty field indicates an indefinite duration.",
   "none": "None",
@@ -54,7 +55,6 @@
   "orderCompleted": "Order placed",
   "orderCompletedSuccessText": "Your order is complete. The items will now appear on the Orders page.",
   "orderForm": "Order Form",
-  "medications": "Medications",
   "ordersAlreadyInBasketWithCount_one": "{count} item(s) already in your basket",
   "ordersAlreadyInBasketWithCount_other": "{count} item(s) already in your basket",
   "pastMedicationsDisplayText": "Past medications",