diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d6b16c99c8656a143476841269c3e3fd8a0c2230..229ae0adfcf3f0d70c720b94661e9a636f7fc91a 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7050,7 +7050,11 @@ pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf
 			     cfs_rq->h_nr_running == cfs_rq->idle_h_nr_running)) {
 			throttle_qos_cfs_rq(cfs_rq);
 			cfs_rq = &rq->cfs;
-			WARN_ON(cfs_rq->nr_running == 0);
+			WARN(cfs_rq->nr_running == 0,
+			     "rq->nr_running=%u, cfs_rq->idle_h_nr_running=%u\n",
+			     rq->nr_running, cfs_rq->idle_h_nr_running);
+			if (unlikely(!cfs_rq->nr_running))
+				return NULL;
 		}
 #endif
 	} while (cfs_rq);