diff --git a/lib_com/options.h b/lib_com/options.h
index 35fe524417d9eb96af6dee81da960372b60ff7b8..8e0de891025129f59e072c160b1578ec9483b11f 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -244,6 +244,7 @@
 #define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */
 #define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */
 #define FIX_680_ACELP_TABLE_OMASA                       /* Nokia: Fix for issue 680 preventing overindexing of PulseConfTable */
+#define FIX_685_BER_IN_HVQ                              /* Eri: Fix for issue 685. Invalid configuration in EVS now happening in IVAS with variable rate core. Remove BER warning for IVAS. */
 
 /* ################## End BE DEVELOPMENT switches ######################### */
 
diff --git a/lib_dec/peak_vq_dec.c b/lib_dec/peak_vq_dec.c
index df238a057f24507e98dffe81769b8914e2468f41..107f87b8524a89477e879efd79c0d92fe0a3ae67 100644
--- a/lib_dec/peak_vq_dec.c
+++ b/lib_dec/peak_vq_dec.c
@@ -280,7 +280,11 @@ static void peak_vq_dec(
     pvq_bands = hvq_pvq_bitalloc( pvq_bits, core_brate, st->bwidth, ynrm, manE_peak, expE_peak, Rk, R, sel_bnds, &n_sel_bnds );
 
     /* safety check in case of bit errors */
+#ifdef FIX_685_BER_IN_HVQ
+    if ( ( pvq_bands == 0 ) && st->element_mode == EVS_MONO ) /* PVQ bands may be zero for IVAS */
+#else
     if ( pvq_bands == 0 )
+#endif
     {
         st->BER_detect = 1;
     }