diff --git a/lib_com/options.h b/lib_com/options.h
index 070fa6c16dceafbe316dc5eea7a5c06a630da0b7..19707c016d094a7c22d90b2dd64ac87410be5be8 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -106,6 +106,7 @@
 #define FIX_2384_INIT_DEQUANT_COV                       /* FhG: basop issue 2384: only read initialized values from Cy_buf_e[k] in ivas_param_mc_dequantize_cov_fx() during renormalization */
 #define FIX_2383_INIT_Q_A_ITF                           /* FhG: Initialize Q_A_itf, to avoid reading of uninitialized memory in case ITF is not triggered */
 #define FIX_2382_COPY_AQ_IN_MCT                         /* FhG: basop issue 2382: 2nd instance of prevent copying uninitialized values from Aq_fx[][] to Aq_fx_32[][] in TCX */
+#define FIX_2391_INIT_HQ_GENERIC_OFFSET                 /* FhG/Eri: basop issue 2391: make sure hq_generic_offset is initialized inside hq_hr_dec_fx() */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/hq_hr_dec_fx.c b/lib_dec/hq_hr_dec_fx.c
index 858306b17dd3fa556a10ba26cf0ad2aa2768b970..bcc330d61fdd1c410f020afb213e6f69bbb9379d 100644
--- a/lib_dec/hq_hr_dec_fx.c
+++ b/lib_dec/hq_hr_dec_fx.c
@@ -435,7 +435,10 @@ void hq_hr_dec_fx(
     move16();
 
     HQ_DEC_HANDLE hHQ_core = st_fx->hHQ_core;
-
+#ifdef FIX_2391_INIT_HQ_GENERIC_OFFSET
+    hq_generic_offset = 0;
+    move16();
+#endif
     move16();
 
     Q_audio = 0; /* to avoid compilation warnings */