diff --git a/apps/renderer.c b/apps/renderer.c
index ace6a73939eeea03f2e9e988ec015946e9b4098e..80a37b2a64549500ccf9de17b6dfc0d8f90e371b 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -1257,8 +1257,8 @@ int main(
     /* Set up output custom layout configuration */
     if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
     {
-        floatToFixed_arrL_app( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
-        floatToFixed_arrL_app( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
+        floatToFixed_arrL_app( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, args.outConfig.outSetupCustom.num_spk );
+        floatToFixed_arrL_app( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, args.outConfig.outSetupCustom.num_spk );
         if ( ( error = IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( hIvasRend, args.outConfig.outSetupCustom ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError in IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
@@ -1362,8 +1362,8 @@ int main(
 
         if ( args.inConfig.multiChannelBuses[i].audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
         {
-            floatToFixed_arrL_app( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
-            floatToFixed_arrL_app( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
+            floatToFixed_arrL_app( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, args.inConfig.inSetupCustom.num_spk );
+            floatToFixed_arrL_app( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, args.inConfig.inSetupCustom.num_spk );
             if ( ( error = IVAS_REND_ConfigureCustomInputLoudspeakerLayout( hIvasRend, mcIds[i], args.inConfig.inSetupCustom ) ) != IVAS_ERR_OK )
             {
                 fprintf( stderr, "\nError in IVAS_REND_ConfigureCustomInputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
@@ -2763,6 +2763,13 @@ static CmdlnArgs defaultArgs(
 
     args.inConfig.inSetupCustom.num_spk = 0;
     args.inConfig.inSetupCustom.num_lfe = 0;
+    for ( i = 0; i < RENDERER_MAX_INPUT_CHANNELS; i++ )
+    {
+        args.inConfig.inSetupCustom.azimuth[i] = 0.f;
+        args.inConfig.inSetupCustom.azimuth_fx[i] = 0;
+        args.inConfig.inSetupCustom.elevation[i] = 0.f;
+        args.inConfig.inSetupCustom.elevation_fx[i] = 0;
+    }
     args.inConfig.numAudioObjects = 0;
     args.inConfig.numAmbisonicsBuses = 0;
     args.inConfig.numMultiChannelBuses = 0;
@@ -2771,6 +2778,13 @@ static CmdlnArgs defaultArgs(
     args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;
     args.outConfig.outSetupCustom.num_spk = 0;
     args.outConfig.outSetupCustom.num_lfe = 0;
+    for ( i = 0; i < RENDERER_MAX_OUTPUT_CHANNELS; i++ )
+    {
+        args.outConfig.outSetupCustom.azimuth[i] = 0.f;
+        args.outConfig.outSetupCustom.azimuth_fx[i] = 0;
+        args.outConfig.outSetupCustom.elevation[i] = 0.f;
+        args.outConfig.outSetupCustom.elevation_fx[i] = 0;
+    }
     for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )
     {
         args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;