diff --git a/lib_com/options.h b/lib_com/options.h
index 3ad74ec3507c2eab581508e8f6e14191568840a4..1007d9ac1643a7dcacae2fecbf5a28250b8da792 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -97,6 +97,7 @@
 #define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA           /* Nokia: issue 944: fix FEC error in OMASA */
 #define NONBE_FIX_949_MC_5MS_FRAMING                    /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */
 #define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/
+#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index d2b3986d7098a7175db0379a51eab395b9eaf15c..bda6b28e2651f36455e344a192c4816fb4d6ddd8 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -1940,12 +1940,14 @@ ivas_error ivas_jbm_dec_render_fx(
             {
                 ivas_dirac_dec_binaural_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output_fx );
             }
+#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE
             ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_NON_DIEGETIC_DOWNMIX ) )
             {
                 *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
                 move16();
                 ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );
             }
+#endif
             ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
             {
                 ivas_param_ism_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );
@@ -1979,7 +1981,7 @@ ivas_error ivas_jbm_dec_render_fx(
                 /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
                 FOR( i = 0; i < st_ivas->nchan_transport; i++ )
                 {
-                    FOR( j = 0; j < 16; j++ )
+                    FOR( j = 0; j < HOA3_CHANNELS; j++ )
                     {
                         st_ivas->hIsmRendererData->gains_fx[i][j] = L_shr( st_ivas->hIsmRendererData->gains_fx[i][j], 1 ); // Q30 -> Q29
                         move32();
@@ -1987,6 +1989,7 @@ ivas_error ivas_jbm_dec_render_fx(
                         move32();
                     }
                 }
+
                 ivas_ism2sba_sf_fx( st_ivas->hTcBuffer->tc_fx, p_output_fx, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );
                 Word16 sba_num_chans = imult1616( add( st_ivas->hIntSetup.ambisonics_order, 1 ), add( st_ivas->hIntSetup.ambisonics_order, 1 ) );
                 FOR( j = 0; j < sba_num_chans; j++ )