diff --git a/lib_com/options.h b/lib_com/options.h
index 30200d09d140d3c9b3585b86b1af6a714457b196..36094f8fea71de2cfa76b03e45af898ba2105594 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -186,6 +186,7 @@
 #define NONBE_FIX_1197_OMASA_META_BUFFER                /* Nokia: OMASA ISM_MASA_MODE_PARAM_ONE_OBJ history zero in rateswitching */
 
 #define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */
+#define FIX_1206_ZERO_OUT_IMDCT_BUFFERS_FOR_MCT_IGNORE  /* FhG: zero out all relevant imdct buffers in MCT decoding of channels with mct_chan_mode == MCT_CHAN_MODE_IGNORE */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c
index 3f8ff738c7c6f29aa1ae032ee21f9f59f88c538d..e07b44da0344350a2d21aef592262d3232d281c0 100644
--- a/lib_dec/ivas_mdct_core_dec.c
+++ b/lib_dec/ivas_mdct_core_dec.c
@@ -865,6 +865,15 @@ void ivas_mdct_core_reconstruct(
                 {
                     set_f( &synth[k * L_frame[ch]], 0.f, L_frame[ch] );
                     set_f( &synthFB[k * L_frame[ch]], 0.f, L_frameTCX[ch] );
+#ifdef FIX_1206_ZERO_OUT_IMDCT_BUFFERS_FOR_MCT_IGNORE
+                    /* Note: these buffers are not subframe-based, hence no indexing with k */
+                    set_f( &st->hHQ_core->old_outLB[0], 0.f, L_frame[ch] );
+                    set_f( &st->hHQ_core->old_out[0], 0.f, L_frameTCX[ch] );
+                    set_f( &st->hTcxDec->syn_Overl[0], 0.f, L_frame[ch] / 2 );
+                    set_f( &st->hTcxDec->syn_OverlFB[0], 0.f, L_frameTCX[ch] / 2 );
+                    set_f( &st->hTcxDec->syn_Overl_TDAC[0], 0.f, L_frame[ch] / 2 );
+                    set_f( &st->hTcxDec->syn_Overl_TDACFB[0], 0.f, L_frameTCX[ch] / 2 );
+#endif
                 }
             }