diff --git a/decoder/ixheaacd_api.c b/decoder/ixheaacd_api.c
index afc4510..31031d2 100644
--- a/decoder/ixheaacd_api.c
+++ b/decoder/ixheaacd_api.c
@@ -1786,6 +1786,9 @@ IA_ERRORCODE ixheaacd_dec_init(
         p_state_enhaacplus_dec->b_n_raw_data_blk--;
       }
 
+      sample_rate_2 = sample_rate_1;
+      frame_size_2 = frame_size_1;
+
       if (!p_state_enhaacplus_dec->str_sbr_dec_info[ch_idx] &&
           p_state_enhaacplus_dec->pstr_stream_sbr[0][0].no_elements) {
         if ((p_obj_exhaacplus_dec->aac_config.flag_16khz_out == 1) &&
@@ -1793,9 +1796,6 @@ IA_ERRORCODE ixheaacd_dec_init(
           p_obj_exhaacplus_dec->aac_config.flag_16khz_out = 0;
         }
 
-        sample_rate_2 = sample_rate_1;
-        frame_size_2 = frame_size_1;
-
         p_state_enhaacplus_dec->str_sbr_dec_info[ch_idx] = ixheaacd_init_sbr(
             sample_rate_1, frame_size_1,
             (FLAG *)&p_obj_exhaacplus_dec->aac_config.down_sample_flag,
@@ -1807,7 +1807,8 @@ IA_ERRORCODE ixheaacd_dec_init(
       } else {
       }
 
-      if (p_state_enhaacplus_dec->str_sbr_dec_info[ch_idx]) {
+      if (p_state_enhaacplus_dec->str_sbr_dec_info[ch_idx] &&
+          p_state_enhaacplus_dec->pstr_stream_sbr[0][0].no_elements) {
         ia_sbr_scr_struct sbr_scratch_struct;
         WORD16 num_channels_1_t = num_channels_1;
         ixheaacd_allocate_sbr_scr(
@@ -1895,6 +1896,7 @@ IA_ERRORCODE ixheaacd_dec_init(
       WORD max_ch_num = p_obj_exhaacplus_dec->aac_config.ui_max_channels;
       i = 0;
 
+      p_obj_exhaacplus_dec->aac_config.ui_n_channels = ch_idx;
       while (p_obj_exhaacplus_dec->aac_config.element_type[ch_idx_err] <= 3 &&
              p_obj_exhaacplus_dec->aac_config.element_type[ch_idx_err] >= 0) {
         ch_idx_err++;