diff --git a/lib_com/options.h b/lib_com/options.h
index 53767145621ab8ac4840834a5372aece50d9ee3f..bb52fc1b0d347a98d53d5738c82bbe0113023b54 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -122,6 +122,7 @@
 #define FIX_2505_IVAS_DEC_SEGFAULT                      /* FhG: BASOP #2505: Add headroom to input of ivas_rend_crendProcessSubframe_fx() for ivas_mdft_fx() calculation */
 #define HARMONIZE_DoRTFTn                               /* VA: harmonize functions DoRTFTn_fx() and DoRTFTn_fx_ivas() */
 #define FIX_BASOP_2529_MASA_RATIO_SCALINGS              /* Nokia: BASOP issue 2529: Fix MASA ratio scalings and verifications */
+#define FIX_BASOP_2525_MASA_MERGE_WRONG_ASSIGN          /* Nokia: BASOP issue 2525: Fix wrong assignment in MASA merge code */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c
index c7f4d147313532d4091e4dc9ea9ce0b9fbee0816..32a85a7aaf0c286998cc379630fe317dbfd246e1 100644
--- a/lib_enc/ivas_masa_enc_fx.c
+++ b/lib_enc/ivas_masa_enc_fx.c
@@ -4010,7 +4010,11 @@ void ivas_merge_masa_metadata_fx(
                     direct_scaler_e = 0;
                     move16();
                     hMeta->directional_meta[0].energy_ratio_fx[sf][band] = Mpy_32_32( direct_scaler_fx, hMeta->directional_meta[0].energy_ratio_fx[sf][band] ); /*q30*/
+#ifdef FIX_BASOP_2525_MASA_MERGE_WRONG_ASSIGN
+                    hMeta->directional_meta[1].energy_ratio_fx[sf][band] = Mpy_32_32( direct_scaler_fx, hMeta->directional_meta[1].energy_ratio_fx[sf][band] ); /*q30*/
+#else
                     hMeta->directional_meta[1].energy_ratio_fx[sf][band] = Mpy_32_32( direct_scaler_fx, hMeta->directional_meta[0].energy_ratio_fx[sf][band] ); /*q30*/
+#endif
                     move32();
                     move32();
                 }