diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c
index ab43e0820bc2..1fcb74c80208 100644
--- a/kernel/sched/walt/walt.c
+++ b/kernel/sched/walt/walt.c
@@ -4530,6 +4530,9 @@ static void walt_do_sched_yield(void *unused, struct rq *rq)
 	struct task_struct *curr = rq->curr;
 	struct walt_task_struct *wts = (struct walt_task_struct *) curr->android_vendor_data1;
 
+	if (unlikely(walt_disabled))
+		return;
+
 	lockdep_assert_held(&rq->__lock);
 	if (!list_empty(&wts->mvp_list) && wts->mvp_list.next)
 		walt_cfs_deactivate_mvp_task(rq, curr);
diff --git a/kernel/sched/walt/walt_rt.c b/kernel/sched/walt/walt_rt.c
index 02ba1d2200c1..e69fe2a9e9de 100644
--- a/kernel/sched/walt/walt_rt.c
+++ b/kernel/sched/walt/walt_rt.c
@@ -329,6 +329,9 @@ static void walt_rt_find_lowest_rq(void *unused, struct task_struct *task,
 {
 	int packing_cpu;
 
+	if (unlikely(walt_disabled))
+		return;
+
 	/* create a fastpath for finding a packing cpu */
 	packing_cpu = walt_find_cluster_packing_cpu(task_cpu(task));
 	if (walt_choose_packing_cpu(packing_cpu, task)) {