diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6334ed78ed5a..d2bbb1e55bdf 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -757,7 +757,7 @@ static struct uclamp_se uclamp_default[UCLAMP_CNT];
 
 static inline unsigned int uclamp_bucket_id(unsigned int clamp_value)
 {
-	return clamp_value / UCLAMP_BUCKET_DELTA;
+	return min_t(unsigned int, clamp_value / UCLAMP_BUCKET_DELTA, UCLAMP_BUCKETS - 1);
 }
 
 static inline unsigned int uclamp_bucket_base_value(unsigned int clamp_value)