diff --git a/lib_com/options.h b/lib_com/options.h
index 9b4fb901dbdc4fdaef2997eae3bf99e4aff3526a..ce0e122c4260aef18d6867c4cdc0eea93be1334f 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -159,6 +159,8 @@
 
 #define FIX_038_TV_FIX_DEC_CRASH_DURING_FEC             /* IVAS-038 Fixed potential decoder crash on frame lost, due to loss of synchronisation between encoder and decoder */
 
+#define FIX_047_ERROR_ENABLING_AGC                      /* IVAS-047, Fix the error reporting when AGC is enabled*/
+
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
 #endif
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index 28a8c3004e58d3b842b703230c06d824cb9fed18..81f13d40d21ad45b8167d2b21f4d28df6ce2271c 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -762,8 +762,12 @@ static ivas_error configureEncoder(
                 /* IVAS_fmToDo: needs more work in case of bitrate switching */
                 hEncoderConfig->sba_order = 1;
             }
+#ifndef FIX_047_ERROR_ENABLING_AGC
 #ifndef SBA_CLEANING
             st_ivas->sba_mode = ivas_sba_mode_select( hEncoderConfig->ivas_total_brate ); // VE: is it needed here?
+#endif
+#else
+            st_ivas->sba_mode = ivas_sba_mode_select( hEncoderConfig->ivas_total_brate );
 #endif
         }
         else if ( hEncoderConfig->ivas_format == MASA_FORMAT )