diff --git a/apps/decoder.c b/apps/decoder.c
index 1b6b7e5d57614343574b70e43718c0ba3877eb19..fb9c75e80eec3efe6298aa5e6488ee75be0a82f4 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -400,6 +400,7 @@ int main(
         }
     }
 
+#ifndef FIX_1158_FASTCONV_REVERB_HRTF
     /*------------------------------------------------------------------------------------------*
      * Open renderer configuration reader file
      *------------------------------------------------------------------------------------------*/
@@ -419,6 +420,7 @@ int main(
             goto cleanup;
         }
     }
+#endif
 
     /*------------------------------------------------------------------------------------------*
      * Configure the decoder
@@ -606,6 +608,17 @@ int main(
             goto cleanup;
         }
 
+#ifdef FIX_1158_FASTCONV_REVERB_HRTF
+        IVAS_DEC_GetDefaultRenderConfig( &renderConfig );
+
+        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 );