diff --git a/apps/decoder.c b/apps/decoder.c
index 5eb6d9f16ff3ccc62ad84092f83a79a877ebf7a7..9a0a7ebd6460f01880e9d433c571e6b588595717 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -408,6 +408,7 @@ int main(
         }
     }
 
+#ifndef FIX_1158_FASTCONV_REVERB_HRTF
     /*------------------------------------------------------------------------------------------*
      * Open renderer configuration reader file
      *------------------------------------------------------------------------------------------*/
@@ -427,6 +428,7 @@ int main(
             goto cleanup;
         }
     }
+#endif
 
     /*------------------------------------------------------------------------------------------*
      * Configure the decoder
@@ -614,6 +616,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 38ab8ff7fef6c634f70f175db401b6650acdac05..f76010a86c55f525f6fd7172cbfdb5f00c6516b4 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -179,6 +179,7 @@
 #define FIX_RETURN                                      /* VA: fix location of function returns */
 #endif
 #define FIX_1135_EXT_RENDERER_HANDLES                   /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */
+#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */
 #define FIX_1166_TDREND_DIV0                            /* FhG,Eri: issue 1166: potential divide by zero in TD Renderer */
 #define FIX_835_PARAMMC_BUFFER_VALUES                   /* FhG: BASOP issue 835: wide range of buffer values for cx in ParamMC */
 
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index 44a10edbe2eca04a5b29c2a76f0aa2621bf4d0a5..a3e62b9702970eef5eabb7889bf6e50d42b407f1 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -141,7 +141,11 @@ void ivas_renderer_select(
         {
             *internal_config = IVAS_AUDIO_CONFIG_HOA3;
 
+#ifdef FIX_1158_FASTCONV_REVERB_HRTF
+            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
+#else
             if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
+#endif
             {
                 *renderer_type = RENDERER_BINAURAL_FASTCONV;
             }