diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index f690f901b6cc..eea87a5354a8 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2804,6 +2804,9 @@ int sched_rr_handler(struct ctl_table *table, int write, void *buffer,
 		sched_rr_timeslice =
 			sysctl_sched_rr_timeslice <= 0 ? RR_TIMESLICE :
 			msecs_to_jiffies(sysctl_sched_rr_timeslice);
+
+		if (sysctl_sched_rr_timeslice <= 0)
+			sysctl_sched_rr_timeslice = jiffies_to_msecs(RR_TIMESLICE);
 	}
 	mutex_unlock(&mutex);