diff --git a/lib_com/options.h b/lib_com/options.h
index e666308ca10ce63d00d4cca87f4ffb11d99296b1..6f502c021775ed72714224ed7193e15f53968d96 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -123,6 +123,7 @@
 #define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */
 #define NONBE_SVD_OPTIMIZATION 
 #define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */
+#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/acelp_core_dec_fx.c b/lib_dec/acelp_core_dec_fx.c
index 2600605225057bfbda9307b0cb6e34d29b9fc554..298c4f1e30e57034055e57792568952b6a8c3f75 100644
--- a/lib_dec/acelp_core_dec_fx.c
+++ b/lib_dec/acelp_core_dec_fx.c
@@ -992,7 +992,11 @@ ivas_error acelp_core_dec_fx(
                 tmpF_fx = *old_exc_s_fx;
                 st->mem_deemph_fx = shl_sat( old_exc_s_fx[st->L_frame - 1], st->Q_syn ); /* Q0 -> Q_syn */
                 move16();
+#ifdef NONBE_1131_ACELP_OOB
+                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, st->L_frame, &tmpF_fx );
+#else
                 PREEMPH_FX( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );
+#endif
                 Copy( old_exc_s_fx + sub( st->L_frame, M ), st->mem_syn2_fx, M );
                 Scale_sig( st->mem_syn2_fx, M, st->Q_syn ); /* Q0 -> Q_syn */
                 Residu3_fx( Aq_fx, old_exc_s_fx, old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame ), st->L_frame, 0 );