diff --git a/app/meteor/imports/client/patients/PastAppointmentsContainer.js b/app/meteor/imports/client/patients/PastAppointmentsContainer.js
index e381c1779..ef3d4c8df 100644
--- a/app/meteor/imports/client/patients/PastAppointmentsContainer.js
+++ b/app/meteor/imports/client/patients/PastAppointmentsContainer.js
@@ -32,7 +32,7 @@ const composer = (props) => {
   return {
     ...props,
     patient,
-    currentAppointment: { ...currentAppointment, calendar: calendars[currentAppointment.calendarId] },
+    currentAppointment: currentAppointment && { ...currentAppointment, calendar: calendars[currentAppointment.calendarId] },
     pastAppointments,
     futureAppointments
   }