diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 1bbf60546b0b..2501a81a1b8b 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4091,24 +4091,19 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 		vruntime -= thresh;
 #ifdef CONFIG_SCHED_WALT
 		if (entity_is_task(se)) {
-			if (task_rtg_high_prio(task_of(se)) ||
-					walt_procfs_low_latency_task(task_of(se))) {
-				vruntime -= thresh;
-				se->vruntime = vruntime;
-			}
-			if (walt_binder_low_latency_task(task_of(se))) {
-				vruntime -= sysctl_sched_latency;
-				se->vruntime = vruntime;
-			}
 			if (per_task_boost(task_of(se)) == TASK_BOOST_STRICT_MAX) {
 				vruntime -= thresh;
 				vruntime -= sysctl_sched_latency;
 				se->vruntime = vruntime;
-			}
-			if ((per_task_boost(task_of(se)) ==
-					TASK_BOOST_STRICT_MAX) ||
-					walt_low_latency_task(task_of(se)) ||
-					task_rtg_high_prio(task_of(se))) {
+				return;
+			} else if (walt_binder_low_latency_task(task_of(se))) {
+				vruntime -= sysctl_sched_latency;
+				se->vruntime = vruntime;
+				return;
+			} else if (task_rtg_high_prio(task_of(se)) ||
+					walt_procfs_low_latency_task(task_of(se))) {
+				vruntime -= thresh;
+				se->vruntime = vruntime;
 				return;
 			}
 		}