diff --git a/lib_com/options.h b/lib_com/options.h
index 8fc5f234655595aff9f9546f984c5a0edd5426a6..58a848cb33f11d5638e7706a4d37bb9faaafef73 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -108,6 +108,7 @@
 #define FIX_BASOP_2491_MDCT_JBM_CLICK                   /* FhG: BASOP #2491: Fix Q_synth after TCX concealment (using ACELP concealment) */
 #define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */
 #define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */
+#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX    /* Nokia: BASOP 2498: Fix the logic */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_enc/ivas_decision_matrix_enc_fx.c b/lib_enc/ivas_decision_matrix_enc_fx.c
index 4cb3aa296df0e6b6ba3d3e44f93aacca5053f1b3..1e2fb73ce6d17ec9e9a52b3f6c3f7ed041fb2e6a 100644
--- a/lib_enc/ivas_decision_matrix_enc_fx.c
+++ b/lib_enc/ivas_decision_matrix_enc_fx.c
@@ -107,7 +107,11 @@ void ivas_decision_matrix_enc_fx(
         move16();
 
         test();
+#ifdef FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX
+        if ( GE_32( st->input_Fs, 32000 ) && GE_16( st->bwidth, SWB ) )
+#else
         if ( GE_32( st->input_Fs, 32000 ) || GE_16( st->bwidth, SWB ) )
+#endif
         {
             st->extl = SWB_CNG;
             move16();