diff --git a/lib_com/options.h b/lib_com/options.h
index 8ddcfb4e9db6d921908912ac31cb241bfb8ff747..058bc845afacfa46b2f5db77872e809103f4b10f 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -110,6 +110,7 @@
 #define FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG      /* Nokia: BASOP issue 2516: Fix porting bug in setting planar state for custom layout in renderer */
 #define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */
 #define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */
+#define FIX_BASOP_2524_MASA_REDUCE_META_BUG             /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c
index 8a957b2678f98d82861130fad233622c22ea1481..4125e6d3025965a8b4d3d539507b3465f9cd0187 100644
--- a/lib_enc/ivas_masa_enc_fx.c
+++ b/lib_enc/ivas_masa_enc_fx.c
@@ -2579,18 +2579,26 @@ static void reduce_metadata_further_fx(
         Word32 x, y, z;
         Word32 veclen, L_tmp;
 
+#ifndef FIX_BASOP_2524_MASA_REDUCE_META_BUG
         W_tmp = 0;
         move64();
+#endif
         FOR( band = 0; band < numCodingBands; band++ )
         {
             xSum = 0;
             ySum = 0;
             zSum = 0;
+#ifndef FIX_BASOP_2524_MASA_REDUCE_META_BUG
             bandSumEnergy = 0;
             move32();
+#endif
             move32();
             move32();
             move32();
+#ifdef FIX_BASOP_2524_MASA_REDUCE_META_BUG
+            W_tmp = 0;
+            move64();
+#endif
 
             FOR( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
             {