diff --git a/lib_com/options.h b/lib_com/options.h
index 42a41806b2b0252798aaffbb5b635199f7a136b0..30f559de2cd9621cf830f2367670beecf592e09d 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -171,7 +171,7 @@
 /* #################### Start NON-BE switches ############################ */
 /* any switch which is non-be wrt. TS 26.258 V3.0 */
 #define FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION         /* Dolby: issue 1465: Fix constant in create_random_vector() to allow more reliable fixed point port */
-
+#define FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG       /* Eri: Basop issue 2317: Uninitialized value read in case of DTX and BW switching   */
 
 #define FIX_1500_ISM_MD_DTX                             /* VA: float issue 1500: fix ISM elevation metadata smoothing in DTX */
 
diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c
index a72142af054462c7e060acd1489d31c221f60d25..85a1952be12a222b4da1fd327d3df15d8ae5b1c7 100644
--- a/lib_enc/ivas_stereo_dft_enc.c
+++ b/lib_enc/ivas_stereo_dft_enc.c
@@ -2980,11 +2980,14 @@ static void stereo_dft_enc_compute_prm(
     /*------------------------------------------------------------------*
      * Compute Side gains
      *-----------------------------------------------------------------*/
-
+#ifdef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG
+    mvr2r( pSideGain, hStereoDft->sidSideGain, STEREO_DFT_BAND_MAX ); /* Copy all sideGain values since BW change may be reverted during CNG */
+#endif
     for ( b = 0; b < hStereoDft->nbands; b++ )
     {
+#ifndef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG
         hStereoDft->sidSideGain[b] = *( pSideGain + b );
-
+#endif
         /* Quantization */
         if ( flag_quant )
         {