diff --git a/apps/decoder.c b/apps/decoder.c
index 9dcd22043ac7058868da0ddbb70da7dc89d4048c..fe6a27dcdf80521a166a773c19a356401b693ba8 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -373,6 +373,7 @@ int main(
         }
     }
 
+#ifndef FIX_1158_FASTCONV_REVERB_HRTF
     /*------------------------------------------------------------------------------------------*
      * Open renderer configuration reader file
      *------------------------------------------------------------------------------------------*/
@@ -393,6 +394,7 @@ int main(
             goto cleanup;
         }
     }
+#endif
 
     /*------------------------------------------------------------------------------------------*
      * Configure the decoder
@@ -482,6 +484,14 @@ int main(
             goto cleanup;
         }
 
+#ifdef FIX_1158_FASTCONV_REVERB_HRTF
+        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
+        {
+            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
+            goto cleanup;
+        }
+#endif
+
         if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
diff --git a/lib_com/options.h b/lib_com/options.h
index 6857f4c95f6ddf7ed7a940cc4f416c5047ef4d05..96c30c404006bae5ed4410b6247598c06c1bf1ec 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -123,6 +123,7 @@
 #define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/
 #define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */
 #define NONBE_FIX_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */
+#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */
 #define NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO    /* FhG: avoid sidegain DFT-Stereo param to be larger than 1 when converting from Dirac parameters */
 #define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */
 #define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */
diff --git a/lib_dec/ivas_output_config_fx.c b/lib_dec/ivas_output_config_fx.c
index d0411a8aa705d6df65e3688eef715327e99f10e1..14341a8886bd99580437f926d8d49314fc2d281e 100644
--- a/lib_dec/ivas_output_config_fx.c
+++ b/lib_dec/ivas_output_config_fx.c
@@ -142,8 +142,14 @@ void ivas_renderer_select(
             move16();
 
             test();
+            test();
+            test();
+#ifdef FIX_1158_FASTCONV_REVERB_HRTF
+            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
+#else
             test();
             IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
+#endif
             {
                 *renderer_type = RENDERER_BINAURAL_FASTCONV;
                 move16();