diff --git a/lib_com/options.h b/lib_com/options.h
index 5a40d36d171f1b877dea301e29838aef34939b9f..9924ed184d7d28d496dd5ed0e48d31504fee3357 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -180,6 +180,7 @@
 #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 NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */
 #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF                    /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */
+#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index 02f848311123596d8a461dee47c151aa47ea5524..bfa2a6ad079c08212a9208f3346626745fba8925 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -774,22 +774,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 */