diff --git a/client/src/components/schedule-calendar/schedule-calendar.component.jsx b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
index 743e0d83a..222be1e3a 100644
--- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx
+++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
@@ -48,7 +48,10 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
     () =>
       data
         .filter((d) => d.__typename === "appointments")
-        .map((app) => `${app.job.est_ct_fn} ${app.job.est_ct_ln}`),
+        .map((app) =>
+          `${app.job?.est_ct_fn || ""} ${app.job?.est_ct_ln || ""}`.trim()
+        )
+        .filter((e) => e.length > 0),
     [data]
   );
 
@@ -59,7 +62,9 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
           ? estimatorsFilter.length === 0
             ? true
             : !!estimatorsFilter.find(
-                (e) => e === `${d.job.est_ct_fn} ${d.job.est_ct_ln}`
+                (e) =>
+                  e ===
+                  `${d.job?.est_ct_fn || ""} ${d.job?.est_ct_ln || ""}`.trim()
               )
           : true;