diff --git a/lib_com/options.h b/lib_com/options.h
index 2c70dd14f900bcf3ae42a391332364aa639d8451..1b6c4b64bb59040a818b12175ade1d4cf97efe41 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -103,6 +103,7 @@
 #define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */
 #define FIX_2271_OOB_INDEXING_IN_PIT_OL2                /* VA: Fix for issue 2271, to silence clang18 */
 #define FIX_2273_OOB_INDEXING_IN_PIT_FR4                /* VA: Fix to silence clang on ptr init */
+#define FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE           /* Eri: Initializes two variables in HQ decoder. They are not used, but they are passed uninitialized to a function which is caught by clang-18 */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/hq_hr_dec_fx.c b/lib_dec/hq_hr_dec_fx.c
index 0d342ba2dca4b8d6c76ba11a26494c5d88a9d067..975b643a4fd331101684d16f39a58d8117e1e52a 100644
--- a/lib_dec/hq_hr_dec_fx.c
+++ b/lib_dec/hq_hr_dec_fx.c
@@ -166,7 +166,10 @@ void ivas_hq_hr_dec_fx(
     Word16 csw_flag1, csw_flag2;
 
     HQ_DEC_HANDLE hHQ_core = st_fx->hHQ_core;
-
+#ifdef FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE
+    hq_generic_offset = 0;
+    move16();
+#endif
     move16();
     move16();