diff --git a/lib_com/options.h b/lib_com/options.h
index e430017666666a03da3c22ffec050405920bf95d..fa2dd5dd2af65dec9523e6b656b75ad914b09471 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -112,6 +112,7 @@
 #define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */
 #define FIX_BASOP_2560_STEREO_DFT_DEC_RESET             /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */
 #define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */
+#define FIX_ISSUE_2568_ADAPT_GR_RPG1                    /* FhG: basop issue 2568: Missing comparison macros in function adapt_GR_rpg1_ief_fx()*/
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/ivas_stereo_adapt_GR_enc_fx.c b/lib_enc/ivas_stereo_adapt_GR_enc_fx.c
index bf54b690137c6f15191664fa0faca5e502bc125a..d1d69a019069836c6df738d59d2ede91a89bdd64 100644
--- a/lib_enc/ivas_stereo_adapt_GR_enc_fx.c
+++ b/lib_enc/ivas_stereo_adapt_GR_enc_fx.c
@@ -225,7 +225,11 @@ Word16 adapt_GR_rpg1_ief_fx(
 
     map0 = &maps[8 * NO_SYMB_GR_PRED_G];
 
+#ifndef FIX_ISSUE_2568_ADAPT_GR_RPG1
     IF( in[0] == 0 )
+#else
+    IF( EQ_16( in[0], 0 ) )
+#endif // !FIX_ISSUE_2568_ADAPT_GR_RPG1
     {
         s = 0;
         move16();
@@ -234,7 +238,11 @@ Word16 adapt_GR_rpg1_ief_fx(
             s = add( s, in[i] );
         }
 
+#ifndef FIX_ISSUE_2568_ADAPT_GR_RPG1
         IF( s == 0 )
+#else
+        IF( EQ_16( s, 0 ) )
+#endif // !FIX_ISSUE_2568_ADAPT_GR_RPG1
         {
             /* encode only the first zero with GR1 */
             *nbits = add( shr( map0[0], 1 ), 2 );