diff --git a/interface/src/app/main/SchedulerDialog.tsx b/interface/src/app/main/SchedulerDialog.tsx
index f2f211c0a..0df8d0f17 100644
--- a/interface/src/app/main/SchedulerDialog.tsx
+++ b/interface/src/app/main/SchedulerDialog.tsx
@@ -164,21 +164,23 @@ const SchedulerDialog = ({
           exclusive
           disabled={!creating}
           onChange={(_event, flag: ScheduleFlag) => {
-            setFieldErrors(undefined); // clear any validation errors
-            setScheduleType(flag);
-            // wipe the time field when changing the schedule type
-            setEditItem({ ...editItem, time: '' });
-            // set the flags based on type
-            // 0-127 is day schedule
-            // 128 is timer
-            // 129 is on change
-            // 130 is on condition
-            // 132 is immediate
-            setEditItem(
-              flag === ScheduleFlag.SCHEDULE_DAY
-                ? { ...editItem, flags: 0 }
-                : { ...editItem, flags: flag }
-            );
+            if (flag !== null) {
+              setFieldErrors(undefined); // clear any validation errors
+              setScheduleType(flag);
+              // wipe the time field when changing the schedule type
+              setEditItem({ ...editItem, time: '' });
+              // set the flags based on type
+              // 0-127 is day schedule
+              // 128 is timer
+              // 129 is on change
+              // 130 is on condition
+              // 132 is immediate
+              setEditItem(
+                flag === ScheduleFlag.SCHEDULE_DAY
+                  ? { ...editItem, flags: 0 }
+                  : { ...editItem, flags: flag }
+              );
+            }
           }}
         >
           <ToggleButton value={ScheduleFlag.SCHEDULE_DAY}>