diff --git a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
index b5b63239..27fdd8ba 100644
--- a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
+++ b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
@@ -337,7 +337,7 @@ export const RotationForm = observer((props: RotationFormProps) => {
     setShiftPeriodDefaultValue(undefined);
     setRecurrenceNum(value);
 
-    if (!isLimitShiftEnabled) {
+    if (!isLimitShiftEnabled && !isMaskedByWeekdays) {
       setShiftEnd(
         dayJSAddWithDSTFixed({
           baseDate: rotationStart,