diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c
index c4753e613bf0..7f36dff545c2 100644
--- a/kernel/sched/walt/walt.c
+++ b/kernel/sched/walt/walt.c
@@ -4325,10 +4325,10 @@ static void android_rvh_build_perf_domains(void *unused, bool *eas_check)
 static void walt_do_sched_yield(void *unused, struct rq *rq)
 {
 	struct task_struct *curr = rq->curr;
-	int mvp_prio = walt_get_mvp_task_prio(curr);
+	struct walt_task_struct *wts = (struct walt_task_struct *) curr->android_vendor_data1;
 
 	lockdep_assert_held(&rq->__lock);
-	if (mvp_prio != WALT_NOT_MVP)
+	if (!list_empty(&wts->mvp_list) && wts->mvp_list.next)
 		walt_cfs_deactivate_mvp_task(curr);
 
 	if (per_cpu(rt_task_arrival_time, cpu_of(rq)))