diff --git a/lib_com/options.h b/lib_com/options.h
index 838bd2a3c38c662d11ab2ce0cf013a7d410e3198..7ab9d0374f50a036d595c4faa907fe82a5e8950f 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -112,6 +112,7 @@
 #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 */
 #define FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX           /* Nokia: BASOP issue 2520: Fix wrong threshold in ParamBin */
+#define FIX_BASOP_2510_UNNECESSARY_ASSERT               /* Nokia: BASOP issue 2510: Fix by removing assert */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_rend/ivas_dirac_rend_fx.c b/lib_rend/ivas_dirac_rend_fx.c
index 2b279656a4ae5d1c8b2827efdbccc67a8e7aad55..97695ce39e0fd485ae6dfcaa5f044e33764eb31c 100644
--- a/lib_rend/ivas_dirac_rend_fx.c
+++ b/lib_rend/ivas_dirac_rend_fx.c
@@ -1252,8 +1252,10 @@ void initDiffuseResponses_fx(
                     move16();
                     Word16 num_horizontal_speakers_isq = ISqrt16( num_horizontal_speakers, &exp_var1 );   // q15-exp_var1
                     num_horizontal_speakers_isq = shr( num_horizontal_speakers_isq, negate( exp_var1 ) ); // q15
+#ifndef FIX_BASOP_2510_UNNECESSARY_ASSERT
                     assert( 0 );
                     /*No stream hitting*/
+#endif
                     FOR( i = 0; i < num_channels; i++ )
                     {
                         diffuse_response_function_fx[i] = mult( diffuse_response_function_fx[i], num_horizontal_speakers_isq ); // q15