diff --git a/lib_com/options.h b/lib_com/options.h
index 62357fbd6be508a24c049f6fe41fd37776ed2c27..4787b591d2556c8794d229015192e7d18306f5f4 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -113,7 +113,7 @@
 #define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */
 #define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */
 #define JBM_MEMORY_OPT                                  /* VA: issue 916: optimization of RAM in the JBM decoder */
-/*#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP*/           /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */
+#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP           /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */
 #define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */
 #define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */
 #define CODE_IMPROVEMENTS
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index ff4374dddce06bb9bc85992aea770455d5536fd9..607e1cb987fd8c19b06fa6d79428feb6c9ce34af 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -3360,7 +3360,8 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate_fx(
     IF( Opt_tsm )
     {
         n_samp_full = NS2SA_FX2( output_Fs, MAX_JBM_L_FRAME_NS );
-        n_samp_residual = add( hTcBuffer->n_samples_granularity, 1 );
+        n_samp_full = max( n_samp_full, L_FRAME48k ); /* buffers are shared between 'hTcBuffer->tc[]' and 'p_output_f[]': ensure minimal length */
+        n_samp_residual = sub( hTcBuffer->n_samples_granularity, 1 );
     }
     ELSE
     {