diff --git a/client/src/components/schedule-calendar/schedule-calendar.component.jsx b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
index 20eb49626..b565a15bf 100644
--- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx
+++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
@@ -49,7 +49,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
             filter.employeevacation &&
             !!d.employee)) &&
         (filter.ins_co_nm && filter.ins_co_nm.length > 0
-          ? filter.ins_co_nm.includes(d.job.ins_co_nm)
+          ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
           : true)
     );
   }, [data, filter]);
@@ -69,7 +69,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                 placeholder={t("schedule.labels.ins_co_nm_filter")}
                 allowClear
                 onClear={() => setFilter({ ...filter, ins_co_nm: [] })}
-                value={filter?.ins_co_nm}
+                value={filter?.ins_co_nm ? filter.ins_co_nm : []}
                 onChange={(e) => {
                   setFilter({ ...filter, ins_co_nm: e });
                 }}