diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index eb7fc24f4131..4c7bab490e77 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -967,7 +967,7 @@ EXPORT_SYMBOL_GPL(sched_uclamp_used);
 
 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_none(enum uclamp_id clamp_id)