diff --git a/lib_com/options.h b/lib_com/options.h
index a22d8ee2fa364c772f04aca564d67bdb654d73e5..e173c197186d577d74fad1de9bf9c4a8c920f4d8 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -115,6 +115,7 @@
 #define FIX_2376_FIX_USAN_PRE_PROC                      /* VA: basop issue 2376: Resolve "USAN: SEGV in ivas_compute_core_buffers_fx() */
 #define FIX_2367_REMOVE_CODE_ICBWE                      /* VA: basop issue 2367: Remove IC-BWE obsolete code  */
 #define REMOVE_SCALING_SHB_SPEECH                       /* VA: remove unnecessary scaling and 32-bit buffers from ivas_core_enc_fx() */
+#define FIX_2352_COPY_AQ_IN_TCX                         /* FhG: basop issue 2352: prevent copying uninitialized values from Aq_fx[][] to Aq_fx_32[][] in TCX */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_stereo_mdct_core_dec_fx.c b/lib_dec/ivas_stereo_mdct_core_dec_fx.c
index c1dc964afa830886770e53f8c71f98266d9d3170..118baa38ba83ba8de21c85e4c5999506ec6b1b90 100644
--- a/lib_dec/ivas_stereo_mdct_core_dec_fx.c
+++ b/lib_dec/ivas_stereo_mdct_core_dec_fx.c
@@ -371,9 +371,17 @@ void stereo_mdct_core_dec_fx(
         }
     }
 
+#ifdef FIX_2352_COPY_AQ_IN_TCX
+    FOR( ch = 0; ch < nChannels; ch++ )
+#else
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
+#endif
     {
+#ifdef FIX_2352_COPY_AQ_IN_TCX
+        Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], nSubframes[ch] * M, sub( Q16, Q12 ) ); /* Q16 */
+#else
         Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], ( NB_SUBFR16k + 1 ) * ( M + 1 ), sub( Q16, Q12 ) ); /* Q16 */
+#endif
     }
 
     /*--------------------------------------------------------------------------------*