diff --git a/lib_com/options.h b/lib_com/options.h
index b97c75dee9ab8cb9b06a1c47d3436a6770e44c8f..3ccf81b46b05a56d4b528e29c321505b2cb7d526 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -188,6 +188,7 @@
 #endif
 #define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */
 #define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT              /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"   */
+#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec.c
index 6b7659b25e6a224e7af6db7ce081d4f0c95c9072..7f6926402a2a37e0932621114b93474f7f746360 100644
--- a/lib_dec/ivas_mc_paramupmix_dec.c
+++ b/lib_dec/ivas_mc_paramupmix_dec.c
@@ -658,6 +658,18 @@ ivas_error ivas_mc_paramupmix_dec_open(
     /* allocate transport channels*/
     hMCParamUpmix->free_param_interpolator = 0;
     hMCParamUpmix->param_interpolator = NULL;
+#ifdef NONBE_FIX_808_JBM_PARAMUPMIX_RS
+    if ( st_ivas->hDecoderConfig->Opt_5ms == 1 )
+    {
+        if ( ( hMCParamUpmix->param_interpolator = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * sizeof( float ) ) ) == NULL )
+        {
+            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) );
+        }
+        hMCParamUpmix->free_param_interpolator = 1;
+
+        ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, DEFAULT_JBM_CLDFB_TIMESLOTS, hMCParamUpmix->param_interpolator );
+    }
+#endif
     if ( st_ivas->hDecoderConfig->Opt_5ms == 1 && st_ivas->hTcBuffer == NULL )
     {
         int16_t nchan_to_allocate;
@@ -667,11 +679,12 @@ ivas_error ivas_mc_paramupmix_dec_open(
         buffer_mode = TC_BUFFER_MODE_RENDERER;
         nchan_tc = ivas_jbm_dec_get_num_tc_channels( st_ivas );
         nchan_to_allocate = MC_PARAMUPMIX_MAX_INPUT_CHANS;
+#ifndef NONBE_FIX_808_JBM_PARAMUPMIX_RS
         if ( ( hMCParamUpmix->param_interpolator = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * sizeof( float ) ) ) == NULL )
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) );
         }
-
+#endif
         if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_MONO )
         {
             buffer_mode = TC_BUFFER_MODE_BUFFER;
@@ -686,9 +699,11 @@ ivas_error ivas_mc_paramupmix_dec_open(
         {
             return error;
         }
+#ifndef NONBE_FIX_808_JBM_PARAMUPMIX_RS
         hMCParamUpmix->free_param_interpolator = 1;
 
         ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, DEFAULT_JBM_CLDFB_TIMESLOTS, hMCParamUpmix->param_interpolator );
+#endif
     }
 
     st_ivas->hMCParamUpmix = hMCParamUpmix;
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index b3996bda8ca740e08907bf40aa33d891fba1ee94..1fb4db5eb8df96b12493198678364ab97f98cd53 100755
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -1346,6 +1346,19 @@ static ivas_error ivas_mc_dec_reconfig(
         {
             tc_nchan_full_new = 0;
         }
+#ifdef NONBE_FIX_808_JBM_PARAMUPMIX_RS
+        else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )
+        {
+            tc_nchan_allocate_new = MC_PARAMUPMIX_MAX_INPUT_CHANS;
+            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_MONO )
+            {
+                tc_buffer_mode_new = TC_BUFFER_MODE_BUFFER;
+                tc_nchan_tc_new = st_ivas->hDecoderConfig->nchan_out;
+                tc_nchan_allocate_new = tc_nchan_tc_new;
+            }
+            tc_nchan_full_new = tc_nchan_allocate_new;
+        }
+#endif
 
         /* reconfigure buffer */
         if ( hTcBuffer->tc_buffer_mode != tc_buffer_mode_new || hTcBuffer->nchan_transport_jbm != tc_nchan_tc_new ||