diff --git a/lib_com/options.h b/lib_com/options.h
index 8eda542ad38319dfe3339602f2dc99a3f6fdeb2b..17849c50a9cfbf5948d0b8c2911904f2ff108805 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -109,6 +109,7 @@
 #define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */
 #define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */
 #define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */
+#define FIX_BASOP_2326_WRONG_SIG_LENGTH                 /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c
index e7534b558483e419c12e2bdd9793293709b84a0d..540838f86a19c30f2ffdb51e5e0842ffd3a6713c 100644
--- a/lib_rend/lib_rend_fx.c
+++ b/lib_rend/lib_rend_fx.c
@@ -9112,8 +9112,15 @@ static ivas_error renderInputMasa(
             }
 
             copyMasaMetadataToDiracRenderer_fx( &masaInput->masaMetadata, masaInput->hMasaExtRend->hSpatParamRendCom, maxBin );
+#ifdef FIX_BASOP_2326_WRONG_SIG_LENGTH
+            FOR( ch = 0; ch < inAudio.config.numChannels; ch++ )
+            {
+                Scale_sig32( tmpBuffer_buff_fx[ch], inAudio.config.numSamplesPerChannel, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
+            }
+#else
             Scale_sig32( tmpBuffer_buff_fx[0], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
             Scale_sig32( tmpBuffer_buff_fx[1], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
+#endif
             // scale_sig32( outAudio.data_fx, i_mult( outAudio.config.numChannels, outAudio.config.numSamplesPerChannel ), sub( Q11, *outAudio.pq_fact ) );
 
             ivas_masa_ext_rend_parambin_render_fx( masaInput->hMasaExtRend, *masaInput->base.ctx.pCombinedOrientationData, tmpBuffer_fx, num_subframes, masaInput->base.ctx.pSplitRendWrapper, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural );
@@ -9137,10 +9144,17 @@ static ivas_error renderInputMasa(
                         masaInput->hMasaExtRend->cldfbAnaRend[0]->Q_cldfb_state = Q11;
                         move16();
                     }
+#ifdef FIX_BASOP_2326_WRONG_SIG_LENGTH
+                    FOR( ch = 0; ch < inAudio.config.numChannels; ch++ )
+                    {
+                        Scale_sig32( tmpBuffer_buff_fx[ch], inAudio.config.numSamplesPerChannel, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
+                    }
+#else
                     FOR( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )
                     {
                         Scale_sig32( tmpBuffer_buff_fx[ch], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
                     }
+#endif
 
                     scale_sig32( outAudio.data_fx, i_mult( outAudio.config.numChannels, outAudio.config.numSamplesPerChannel ), sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
 
@@ -9164,8 +9178,15 @@ static ivas_error renderInputMasa(
 
                     copyMasaMetadataToDiracRenderer_fx( &masaInput->masaMetadata, masaInput->hMasaExtRend->hSpatParamRendCom, maxBin );
 
+#ifdef FIX_BASOP_2326_WRONG_SIG_LENGTH
+                    FOR( ch = 0; ch < inAudio.config.numChannels; ch++ )
+                    {
+                        Scale_sig32( tmpBuffer_buff_fx[ch], inAudio.config.numSamplesPerChannel, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
+                    }
+#else
                     Scale_sig32( tmpBuffer_buff_fx[0], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
                     Scale_sig32( tmpBuffer_buff_fx[1], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
+#endif
 
                     scale_sig32( outAudio.data_fx, i_mult( outAudio.config.numChannels, outAudio.config.numSamplesPerChannel ), sub( Q11, *outAudio.pq_fact ) );