diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index 824e6fb5e461..17062eff390f 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -179,7 +179,6 @@ static int aggregate_requests(struct icc_node *node)
 {
 	struct icc_provider *p = node->provider;
 	struct icc_req *r;
-	u32 avg_bw, peak_bw;
 
 	node->avg_bw = 0;
 	node->peak_bw = 0;
@@ -188,14 +187,9 @@ static int aggregate_requests(struct icc_node *node)
 		p->pre_aggregate(node);
 
 	hlist_for_each_entry(r, &node->req_list, req_node) {
-		if (r->enabled) {
-			avg_bw = r->avg_bw;
-			peak_bw = r->peak_bw;
-		} else {
-			avg_bw = 0;
-			peak_bw = 0;
-		}
-		p->aggregate(node, r->tag, avg_bw, peak_bw,
+		if (!r->enabled)
+			continue;
+		p->aggregate(node, r->tag, r->avg_bw, r->peak_bw,
 			     &node->avg_bw, &node->peak_bw);
 	}