diff --git a/lib_com/options.h b/lib_com/options.h
index fc6c6a06aa9b688784be96d4fba2e75ed2d74dfa..3e00a897110497f4746be63b58cf5ed554c2abbe 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -155,6 +155,7 @@
 #define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/
 #define FIX_OLD_BINARY_FORMAT                           /* Orange: temporary to maintain bitexactness */
 #define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */
+#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 69288104ec9ab2b445ae94a82ff515a9b568c6b7..9c724cdfd9aa16bdb8dee1d212f1453da69c25cc 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -1030,11 +1030,13 @@ ivas_error ivas_jbm_dec_render(
             {
                 ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output );
             }
+#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE
             else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )
             {
                 *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
                 ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );
             }
+#endif
             else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )
             {
                 ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );