diff --git a/lib_com/options.h b/lib_com/options.h
index 82f5d7c6c0876b57d1051da0207000cb1e73efb0..e533e2822b7c91a6c14c42d6a2f79a79bc991ad6 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -192,6 +192,7 @@
 #define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING           /* Dlb: issue 907: fix for band mapping at VLBR */  
 #define NONBE_FIX_869_MASA_PREREND_MERGE                      /* Nokia: issue: #869: MASA pre-rend not updating energy */
 #define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */
+#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_qmetadata_dec_fx.c b/lib_dec/ivas_qmetadata_dec_fx.c
index c78c51c52aae3a7351ac604da7fea2a00521c962..e1c3ee726499c164ee36dcdba993491de1e0db5b 100644
--- a/lib_dec/ivas_qmetadata_dec_fx.c
+++ b/lib_dec/ivas_qmetadata_dec_fx.c
@@ -4646,7 +4646,11 @@ static void read_stream_dct_coeffs_omasa_fx(
     Word16 *index,           /*Q0*/
     const Word16 first_line /*Q0*/ )
 {
+#ifdef FIX_940_DEBUGGING_VARIABLE
+    Word16 sign;
+#else
     Word16 sign, nbits;
+#endif
     Word16 i, j, i_min;
 
     Word32 step;
@@ -4654,7 +4658,9 @@ static void read_stream_dct_coeffs_omasa_fx(
 
     step = STEP_M2T_FX;
     move32();
+#ifndef FIX_940_DEBUGGING_VARIABLE
     nbits = 0;
+#endif
     move16();
     sign = 1;
     move16();
@@ -4668,7 +4674,9 @@ static void read_stream_dct_coeffs_omasa_fx(
             sign = -1;
             move16();
         }
+#ifndef FIX_940_DEBUGGING_VARIABLE
         nbits = add( nbits, 1 );
+#endif
     }
 
     set16_fx( q_idx, 0, len_stream );
@@ -4694,7 +4702,9 @@ static void read_stream_dct_coeffs_omasa_fx(
             {
                 i_min = extract_l( L_add( shl( i_min, 1 ), bit_stream[( *index )--] ) ); /*Q0*/
             }
+#ifndef FIX_940_DEBUGGING_VARIABLE
             nbits = add( nbits, j );
+#endif
             /* read GR orders */
             GR1 = extract_l( L_add( bit_stream[( *index )--], 1 ) ); /*Q0*/
             IF( EQ_16( GR1, 2 ) )