diff --git a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
index 1242abca..82b1e707 100644
--- a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
+++ b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
@@ -154,7 +154,7 @@ const RotationForm: FC<RotationFormProps> = observer((props) => {
       rolling_users: userGroups,
       interval: repeatEveryValue,
       frequency: repeatEveryPeriod,
-      by_day: repeatEveryPeriod === 1 ? selectedDays : null,
+      by_day: repeatEveryPeriod === 1 || repeatEveryPeriod === 0 ? selectedDays : null,
       priority_level: shiftId === 'new' ? layerPriority : shift?.priority_level,
     }),
     [
@@ -320,7 +320,7 @@ const RotationForm: FC<RotationFormProps> = observer((props) => {
                 />
               </Field>
             </HorizontalGroup>
-            {repeatEveryPeriod === 1 && (
+            {(repeatEveryPeriod === 1 || repeatEveryPeriod === 0) && (
               <Field label="Select days to repeat">
                 <DaysSelector
                   options={store.scheduleStore.byDayOptions}