diff --git a/kernel/sched/walt/core_ctl.c b/kernel/sched/walt/core_ctl.c
index e995f316ba76..b69e15641823 100644
--- a/kernel/sched/walt/core_ctl.c
+++ b/kernel/sched/walt/core_ctl.c
@@ -654,7 +654,8 @@ static int compute_cluster_nr_strict_need(int index)
 	struct cluster_data *cluster;
 	int nr_strict_need = 0;
 
-	if (index != 0)
+	/* For single cluster skip calculations */
+	if ((index != 0) || (num_clusters < 2))
 		return 0;
 
 	for_each_cluster(cluster, index) {