diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 66cbb043c6fa..6eb2fdd6b17b 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3858,7 +3858,9 @@ static inline bool task_fits_max(struct task_struct *p, int cpu)
 
 	if (is_min_capacity_cpu(cpu)) {
 		if (task_boost_policy(p) == SCHED_BOOST_ON_BIG ||
-				task_boost > 0)
+				task_boost > 0 ||
+				uclamp_boosted(p) ||
+				walt_should_kick_upmigrate(p, cpu))
 			return false;
 	} else { /* mid cap cpu */
 		if (task_boost > TASK_BOOST_ON_MID)