diff --git a/lib_com/options.h b/lib_com/options.h
index 4c786f3b9593f5e7500962fb1fb7090ba4d3e272..bc8ad05aa28ba711b7cc604014b21d2fe650a3f0 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -191,6 +191,8 @@
 #define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */
 #define NONBE_FIX_846_JBM_MASA_SIDSTART                       /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */
 #define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */
+#define NONBE_FIX_840_PARAMMC_RS                              /* FhG: Issue #840: Resolve "MC RS ParamMC hoa encoder wrongly set to zero" */
+
 /* ##################### End NON-BE switches ########################### */
 
 /* ################## End DEVELOPMENT switches ######################### */
diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c
index fc8f4587bf3e0a2ee2cd29bffb401ab99eebcd72..b1bcb298ef977f4176b4f509d6815bd386d305ec 100644
--- a/lib_dec/ivas_mc_param_dec.c
+++ b/lib_dec/ivas_mc_param_dec.c
@@ -584,7 +584,9 @@ ivas_error ivas_param_mc_dec_reconfig(
     hTransportSetup = st_ivas->hTransSetup;
     mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config );
     nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;
+#ifndef NONBE_FIX_840_PARAMMC_RS
     hParamMC->hoa_encoder = NULL;
+#endif
 
     if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )
     {