diff --git a/lib_com/options.h b/lib_com/options.h
index 8242a0b719dfd0c9fdb939a15bfbe6a88a75ed0c..5e9f95272d8ebbd097a321cd1570125e2c7f9502 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -96,7 +96,7 @@
 #define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */
 #define HARMONIZE_2595_reconfig_decoder_LPD             /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */
 #define HARMONIZE_2596_SetModeIndex                     /* FhG: Harmonize SetModeIndex with its ivas derivate */
-
+#define FIX_ISSUE_2550_REVIEW_CONDITIONS
 /* #################### End BE switches ################################## */
 
 /* #################### Start NON-BE switches ############################ */
diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c
index 82ff1cb614ee9d6d5ed4cce42e1de2e4db2b4584..95cfa5c500745c789bbc5715c42cf95aac82c255 100644
--- a/lib_enc/tcx_utils_enc_fx.c
+++ b/lib_enc/tcx_utils_enc_fx.c
@@ -2406,6 +2406,9 @@ void tcx_encoder_memory_update_fx(
     Copy( synth + sub( L_frame_glob, L_SYN_MEM ), LPDmem->mem_syn_r, L_SYN_MEM );
 
     test();
+#ifdef FIX_ISSUE_2550_REVIEW_CONDITIONS
+    assert( st->tcxonly == 0 || GE_16( L_frame_glob, L_FRAME16k ) );
+#endif // FIX_ISSUE_2550_REVIEW_CONDITIONS
     IF( st->tcxonly == 0 || LE_16( L_frame_glob, L_FRAME16k ) )
     {
         /* Update excitation */
@@ -2483,6 +2486,10 @@ void tcx_encoder_memory_update_ivas_fx(
     move16();
 
     test();
+#ifdef FIX_ISSUE_2550_REVIEW_CONDITIONS
+    assert( st->tcxonly == 0 || GE_16( L_frame_glob, L_FRAME16k ) );
+#endif // FIX_ISSUE_2550_REVIEW_CONDITIONS
+
     IF( st->tcxonly == 0 || LE_16( L_frame_glob, L_FRAME16k ) )
     {
         /* Update excitation */