diff --git a/apps/decoder.c b/apps/decoder.c
index ea31b85dfd8ba900ce970b52247be3693287d15f..aed6800dff4adf165b333a9370d34b64ae6c80bf 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -406,6 +406,7 @@ int main(
         }
     }
 
+#ifndef FIX_1158_FASTCONV_REVERB_HRTF
     /*------------------------------------------------------------------------------------------*
      * Open renderer configuration reader file
      *------------------------------------------------------------------------------------------*/
@@ -426,6 +427,7 @@ int main(
             goto cleanup;
         }
     }
+#endif
 
     /*------------------------------------------------------------------------------------------*
      * Configure the decoder
@@ -619,6 +621,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 6cad54698e10e13a3d880d2ddf7c0a1be00eeff1..2cd90f793351f1bc3941aeed6633c4cfb71915f0 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -213,6 +213,8 @@
 #define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/
 #define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */
 
+#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */
+
 /* #################### End BASOP porting switches ############################ */
 
 /* clang-format on */
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index 3c969b612f37336b01fc508e38b883eb639d883c..6aea937ceedee3ad97af0af1ab89b53682cb802e 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;
             }