diff --git a/lib_com/options.h b/lib_com/options.h
index e4c1de494d3cc1bf3bb5f1758d8668cabc0d82c1..9d90709d4e2d5ba54131fb23a3c08e9d34f3fd8b 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -221,10 +221,12 @@
 #define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */
 #define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */
 #define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */
+
 #define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
 #define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */
 #define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */
 #define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */
+#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE            /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index adcfdaa4e7cbd7aef9a0439b0408685a1bef19f1..5d1d9fc1eb5f8fcf7982f648a7b53b301c83b6f1 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -794,22 +794,29 @@ static ivas_error ivas_mc_dec_reconfig(
     ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config );
 
     /* transfer subframe info from DirAC or ParamMC to central tc buffer */
-    if ( last_mc_mode == MC_MODE_PARAMMC )
+#ifdef NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE
+    if ( st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )
     {
-        st_ivas->hTcBuffer->nb_subframes = st_ivas->hParamMC->nb_subframes;
-        st_ivas->hTcBuffer->subframes_rendered = st_ivas->hParamMC->subframes_rendered;
-        st_ivas->hTcBuffer->num_slots = st_ivas->hParamMC->num_slots;
-        st_ivas->hTcBuffer->slots_rendered = st_ivas->hParamMC->slots_rendered;
-        mvs2s( st_ivas->hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
-    }
-    else if ( last_mc_mode == MC_MODE_MCMASA && st_ivas->hSpatParamRendCom != NULL )
-    {
-        st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
-        st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
-        st_ivas->hTcBuffer->num_slots = st_ivas->hSpatParamRendCom->num_slots;
-        st_ivas->hTcBuffer->slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
-        mvs2s( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
+#endif
+        if ( last_mc_mode == MC_MODE_PARAMMC )
+        {
+            st_ivas->hTcBuffer->nb_subframes = st_ivas->hParamMC->nb_subframes;
+            st_ivas->hTcBuffer->subframes_rendered = st_ivas->hParamMC->subframes_rendered;
+            st_ivas->hTcBuffer->num_slots = st_ivas->hParamMC->num_slots;
+            st_ivas->hTcBuffer->slots_rendered = st_ivas->hParamMC->slots_rendered;
+            mvs2s( st_ivas->hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
+        }
+        else if ( last_mc_mode == MC_MODE_MCMASA && st_ivas->hSpatParamRendCom != NULL )
+        {
+            st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
+            st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
+            st_ivas->hTcBuffer->num_slots = st_ivas->hSpatParamRendCom->num_slots;
+            st_ivas->hTcBuffer->slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
+            mvs2s( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
+        }
+#ifdef NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE
     }
+#endif
 
     /* JBM: when granularity goes down (e.g. MCT with CREND -> ParamMC with binaural fastconv
             render what still fits in the new granularity */