diff --git a/kernel/sched/walt/boost.c b/kernel/sched/walt/boost.c
index dbab4634a988..ddfe83366013 100644
--- a/kernel/sched/walt/boost.c
+++ b/kernel/sched/walt/boost.c
@@ -225,12 +225,12 @@ static void sched_boost_enable(int type)
 static void sched_boost_disable_all(void)
 {
 	int i;
+	int prev_boost = sched_boost_type;
 
-	for (i = SCHED_BOOST_START; i < SCHED_BOOST_END; i++) {
-		if (sched_boosts[i].refcount > 0) {
-			sched_boosts[i].exit();
+	if (prev_boost != NO_BOOST) {
+		sched_boosts[prev_boost].exit();
+		for (i = SCHED_BOOST_START; i < SCHED_BOOST_END; i++)
 			sched_boosts[i].refcount = 0;
-		}
 	}
 }