diff --git a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/history/styles.scss b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/history/styles.scss
index 83bb93817..b2a50a018 100644
--- a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/history/styles.scss
+++ b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/history/styles.scss
@@ -5,6 +5,7 @@
 
 .notesContainer {
   margin: layout.$spacing-04;
+  padding-bottom: layout.$spacing-04;
 }
 
 .notesContainerHeader {
diff --git a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/notes.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/notes.workspace.tsx
index 144eb7e31..666eb840a 100644
--- a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/notes.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/notes.workspace.tsx
@@ -6,8 +6,8 @@ import PatientNotesHistory from './history/notes-container.component';
 
 const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceProps> = (props) => {
   const { wardPatient, ...restWorkspaceProps } = props;
-  const patientUuid = wardPatient.patient?.uuid;
-  const { visit } = wardPatient;
+  const patientUuid = wardPatient?.patient?.uuid;
+
   const notesFormState = {
     patientUuid,
     ...restWorkspaceProps,
@@ -17,7 +17,7 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceProps> = (props) =
     <div>
       <WardPatientWorkspaceBanner {...wardPatient} />
       <PatientNotesForm {...notesFormState} />
-      <PatientNotesHistory patientUuid={patientUuid} visitUuid={visit.uuid} />
+      <PatientNotesHistory patientUuid={patientUuid} visitUuid={wardPatient?.visit.uuid} />
     </div>
   );
 };