diff --git a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
index 216888fbe0a87dbe439801dfacb57441400b2bad..5867a44b329a51b5356927c330fc8339ca9886a8 100644
--- a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
+++ b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
@@ -1241,6 +1241,13 @@ void ivas_sba_dirac_stereo_dec_fx(
     CPE_DEC_HANDLE hCPE;
     STEREO_DFT_DEC_DATA_HANDLE hStereoDft;
 
+#ifdef MSAN_FIX
+    FOR( Word16 i = 0; i < CPE_CHANNELS; i++ )
+    {
+        set32_fx( DFT[i], 0, STEREO_DFT_BUF_MAX );
+    }
+#endif
+
     hSCE = st_ivas->hSCE[0];
     hCPE = st_ivas->hCPE[0];
     hStereoDft = hCPE->hStereoDft;
diff --git a/lib_enc/cod_tcx_fx.c b/lib_enc/cod_tcx_fx.c
index 94b030f5aa4452e11b927a44042b09bc15a5c4d8..b2fe04ce13f5fcb65f8a7abd6a47bba15f06a1c1 100644
--- a/lib_enc/cod_tcx_fx.c
+++ b/lib_enc/cod_tcx_fx.c
@@ -1717,6 +1717,10 @@ void EstimateStereoTCXNoiseLevel_fx(
     Word16 *fac_ns_q;
     Word32 total_brate;
 
+#ifdef MSAN_FIX
+    set32_fx( combined_q_spectrum, 0, N_MAX );
+#endif
+
     FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
         Encoder_State *st = sts[ch];