diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c
index a8fb34e2afb0..062a4c28f870 100644
--- a/kernel/sched/walt/walt.c
+++ b/kernel/sched/walt/walt.c
@@ -4169,11 +4169,6 @@ static void android_rvh_enqueue_task(void *unused, struct rq *rq, struct task_st
 		double_enqueue = true;
 	}
 
-	if (cpu_halted(cpu_of(rq)) && !(p->flags & PF_KTHREAD) && !walt_halt_check_last(cpu_of(rq)))
-		WALT_BUG(WALT_BUG_NONCRITICAL, p,
-			 "Non Kthread Started on halted cpu_of(rq)=%d comm=%s(%d) affinity=0x%x\n",
-			 cpu_of(rq), p->comm, p->pid, (*(cpumask_bits(p->cpus_ptr))));
-
 	wallclock = walt_rq_clock(rq);
 	if (wts->enqueue_after_migration != 0) {
 		wallclock = walt_sched_clock();
diff --git a/kernel/sched/walt/walt.h b/kernel/sched/walt/walt.h
index 9e074bcc5a14..68fd34e7ed15 100644
--- a/kernel/sched/walt/walt.h
+++ b/kernel/sched/walt/walt.h
@@ -1075,7 +1075,6 @@ extern void walt_cfs_deactivate_mvp_task(struct rq *rq, struct task_struct *p);
 enum WALT_DEBUG_FEAT {
 	WALT_BUG_UPSTREAM,
 	WALT_BUG_WALT,
-	WALT_BUG_NONCRITICAL,
 	WALT_BUG_UNUSED,
 
 	/* maximum 4 entries allowed */