diff --git a/decoder/drc_src/impd_drc_eq.c b/decoder/drc_src/impd_drc_eq.c
index 3ebb366..c9983db 100644
--- a/decoder/drc_src/impd_drc_eq.c
+++ b/decoder/drc_src/impd_drc_eq.c
@@ -1037,63 +1037,60 @@ VOID impd_calc_filt_sect_delay(WORD32 section_count,
 
 VOID impd_get_eq_set_delay(ia_eq_set_struct* eq_set, WORD32* cascade_delay) {
   FLOAT32 delay, sect_delay;
-  WORD32 k, g, c, b;
+  WORD32 k, g, b;
 
   delay = 0;
-  for (c = 0; c < eq_set->audio_num_chan; c++) {
-    g = eq_set->eq_ch_group_of_channel[c];
-    if (g >= 0) {
-      switch (eq_set->domain) {
-        case EQ_FILTER_DOMAIN_TIME: {
-          ia_filt_cascade_td_struct* filt_cascade_td =
-              &eq_set->filt_cascade_td[g];
-          for (b = 0; b < filt_cascade_td->block_count; b++) {
-            ia_eq_filt_ele_struct* eq_filt_element =
-                &filt_cascade_td->pstr_eq_filt_block[b].eq_filt_element[0];
-            switch (eq_filt_element->format) {
-              case FILTER_ELEMENT_FORMAT_POLE_ZERO:
-                impd_calc_filt_sect_delay(
-                    eq_filt_element->pstr_pole_zero_filt.section_count,
-                    eq_filt_element->pstr_pole_zero_filt.filt_section,
-                    &sect_delay);
-                delay += sect_delay;
-                if (eq_filt_element->pstr_pole_zero_filt.filt_coeffs_flag) {
-                  delay += 0.5f * (eq_filt_element->pstr_pole_zero_filt
-                                       .fir_filter.coeff_count -
-                                   1);
-                }
-                break;
-              case FILTER_ELEMENT_FORMAT_FIR:
-                delay += 0.5f * (eq_filt_element->fir_filter.coeff_count - 1);
-                break;
-              default:
-                break;
-            }
-            for (k = 0; k < eq_filt_element->num_ph_align_filt; k++) {
-              ia_ph_alignment_filt_struct* ph_alignment_filt =
-                  &eq_filt_element->ph_alignment_filt[k];
-              impd_calc_filt_sect_delay(ph_alignment_filt->section_count,
-                                        ph_alignment_filt->filt_section,
-                                        &sect_delay);
+  g = eq_set->eq_ch_group_of_channel[0];
+  if (g >= 0) {
+    switch (eq_set->domain) {
+      case EQ_FILTER_DOMAIN_TIME: {
+        ia_filt_cascade_td_struct* filt_cascade_td =
+            &eq_set->filt_cascade_td[g];
+        for (b = 0; b < filt_cascade_td->block_count; b++) {
+          ia_eq_filt_ele_struct* eq_filt_element =
+              &filt_cascade_td->pstr_eq_filt_block[b].eq_filt_element[0];
+          switch (eq_filt_element->format) {
+            case FILTER_ELEMENT_FORMAT_POLE_ZERO:
+              impd_calc_filt_sect_delay(
+                  eq_filt_element->pstr_pole_zero_filt.section_count,
+                  eq_filt_element->pstr_pole_zero_filt.filt_section,
+                  &sect_delay);
               delay += sect_delay;
-            }
+              if (eq_filt_element->pstr_pole_zero_filt.filt_coeffs_flag) {
+                delay += 0.5f * (eq_filt_element->pstr_pole_zero_filt.fir_filter
+                                     .coeff_count -
+                                 1);
+              }
+              break;
+            case FILTER_ELEMENT_FORMAT_FIR:
+              delay += 0.5f * (eq_filt_element->fir_filter.coeff_count - 1);
+              break;
+            default:
+              break;
           }
-          for (b = 0; b < filt_cascade_td->num_ph_align_filt; b++) {
+          for (k = 0; k < eq_filt_element->num_ph_align_filt; k++) {
             ia_ph_alignment_filt_struct* ph_alignment_filt =
-                &filt_cascade_td->ph_alignment_filt[b];
+                &eq_filt_element->ph_alignment_filt[k];
             impd_calc_filt_sect_delay(ph_alignment_filt->section_count,
                                       ph_alignment_filt->filt_section,
                                       &sect_delay);
             delay += sect_delay;
           }
-        } break;
-        case EQ_FILTER_DOMAIN_SUBBAND:
-        case EQ_FILTER_DOMAIN_NONE:
-        default:
-          break;
-      }
+        }
+        for (b = 0; b < filt_cascade_td->num_ph_align_filt; b++) {
+          ia_ph_alignment_filt_struct* ph_alignment_filt =
+              &filt_cascade_td->ph_alignment_filt[b];
+          impd_calc_filt_sect_delay(ph_alignment_filt->section_count,
+                                    ph_alignment_filt->filt_section,
+                                    &sect_delay);
+          delay += sect_delay;
+        }
+      } break;
+      case EQ_FILTER_DOMAIN_SUBBAND:
+      case EQ_FILTER_DOMAIN_NONE:
+      default:
+        break;
     }
-    break;
   }
   *cascade_delay = (WORD32)delay;
   return;
diff --git a/decoder/drc_src/impd_drc_loudness_control.c b/decoder/drc_src/impd_drc_loudness_control.c
index 687fc6f..9937e18 100644
--- a/decoder/drc_src/impd_drc_loudness_control.c
+++ b/decoder/drc_src/impd_drc_loudness_control.c
@@ -304,20 +304,16 @@ WORD32 impd_signal_peak_level_info(
               &pstr_drc_config->str_drc_instruction_str[n];
           if (loudness_drc_set_id_requested ==
               drc_instructions_drc_tmp->drc_set_id) {
-            for (k = 0; k < drc_instructions_drc_tmp->dwnmix_id_count; k++) {
-              if (ID_FOR_BASE_LAYOUT ==
-                  drc_instructions_drc_tmp->downmix_id[k]) {
-                if (drc_instructions_drc_tmp->limiter_peak_target_present) {
-                  eq_set_id[peak_count] = -1;
-                  signal_peak_level[peak_count] =
-                      drc_instructions_drc_tmp->limiter_peak_target +
-                      signal_peak_level_tmp;
-                  explicit_peak_information_present[peak_count] = 0;
-                  match_found_flag = 1;
-                  peak_count++;
-                }
+            if (ID_FOR_BASE_LAYOUT == drc_instructions_drc_tmp->downmix_id[0]) {
+              if (drc_instructions_drc_tmp->limiter_peak_target_present) {
+                eq_set_id[peak_count] = -1;
+                signal_peak_level[peak_count] =
+                    drc_instructions_drc_tmp->limiter_peak_target +
+                    signal_peak_level_tmp;
+                explicit_peak_information_present[peak_count] = 0;
+                match_found_flag = 1;
+                peak_count++;
               }
-              break;
             }
           }
         }