diff --git a/lib_com/options.h b/lib_com/options.h
index 004c90f8e35084db933096244ce4fff852ac7e80..5fe239eddf0c844e3fed675fcb45ba2e2532f3e3 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -181,6 +181,7 @@
 #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" */
 #define NONBE_FIX_826_JBM_MASA_CNA_CNG                        /* FhG: issue #826:  Resolve "JBM MASA: CNA and CNG not in sync with non-JBM decoding" */
+#define NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT                  /* FhG: issue #835: Resolve "JBM: ParamUpmix head rotation broken" */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec.c
index 9cc415b39ee56a417a6fc61814655522bb057869..df15270c8bc023a9c32a3478c4a9e839758dcaf9 100644
--- a/lib_dec/ivas_mc_paramupmix_dec.c
+++ b/lib_dec/ivas_mc_paramupmix_dec.c
@@ -1020,6 +1020,17 @@ static void ivas_mc_paramupmix_dec_sf(
     int16_t noparamupmix_delay, n_samples_rendered;
     MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;
     int16_t subframeIdx, idx_in, maxBand;
+#ifdef NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT
+    float Cldfb_RealBuffer_subfr[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+    float Cldfb_ImagBuffer_subfr[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+#ifdef SPLIT_REND_WITH_HEAD_ROT
+    float Cldfb_RealBuffer_Binaural[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+    float Cldfb_ImagBuffer_Binaural[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+#else
+    float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+    float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
+#endif
+#else
 #ifdef SPLIT_REND_WITH_HEAD_ROT
     float Cldfb_RealBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
     float Cldfb_ImagBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
@@ -1031,6 +1042,7 @@ static void ivas_mc_paramupmix_dec_sf(
     float Cldfb_ImagBuffer_subfr[3 + MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
     float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
     float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
+#endif
 #endif
 
     hMCParamUpmix = st_ivas->hMCParamUpmix;
@@ -1119,10 +1131,21 @@ static void ivas_mc_paramupmix_dec_sf(
             idx_in += 2;
         }
 
+#ifdef NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT
+        if ( st_ivas->hCombinedOrientationData && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )
+        {
+            for ( slot_idx = 0; slot_idx < st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->subframes_rendered]; slot_idx++ )
+            {
+                ivas_param_mc_mc2sba_cldfb( st_ivas->hTransSetup, hMCParamUpmix->hoa_encoder, slot_idx, Cldfb_RealBuffer_subfr, Cldfb_ImagBuffer_subfr, maxBand, GAIN_LFE );
+            }
+        }
+#endif
+
 #ifdef SPLIT_REND_WITH_HEAD_ROT
         /*LFE handling for split rendering cases*/
         if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
         {
+#ifndef NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT
             for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )
             {
                 ch = st_ivas->hIntSetup.index_lfe[idx_lfe];
@@ -1132,6 +1155,7 @@ static void ivas_mc_paramupmix_dec_sf(
                 }
                 idx_in++;
             }
+#endif
 
 #ifdef SPLIT_REND_WITH_HEAD_ROT
             if ( st_ivas->hSplitBinRend.hCldfbDataOut != NULL )