diff --git a/lib_enc/core_switching_enc.c b/lib_enc/core_switching_enc.c
index 06d140a094d3066cc7e8c7189070f5e6e026e21b..1b69de26d8a6fcfbcc65d8b07999bf079d6e867d 100644
--- a/lib_enc/core_switching_enc.c
+++ b/lib_enc/core_switching_enc.c
@@ -586,14 +586,10 @@ void core_switching_post_enc_ivas_fx(
         /* Fade towards init value for non HQ_CORE */
         IF( st->hHQ_core != NULL )
         {
-            st->hHQ_core->crest_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), HQ_CREST_THRESHOLD_FX ) ); /*Q28*/
+            st->hHQ_core->crest_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), L_shr( HQ_CREST_THRESHOLD_FX, sub( Q28, st->hHQ_core->crest_lp_q ) ) ) ); /*crest_lp_q*/
             move32();
-            st->hHQ_core->crest_lp_q = Q28;
-            move16();
-            st->hHQ_core->crest_mod_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_mod_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), HQ_CREST_MOD_THRESHOLD_FX ) ); /*Q29*/
+            st->hHQ_core->crest_mod_lp_fx = L_add( Mpy_32_32( HQ_CREST_FAC_SM_FX, st->hHQ_core->crest_mod_lp_fx ), Mpy_32_32( L_sub( ONE_IN_Q31, HQ_CREST_FAC_SM_FX ), L_shr( HQ_CREST_MOD_THRESHOLD_FX, sub( Q29, st->hHQ_core->crest_mod_lp_q ) ) ) ); /*crest_mod_lp_q*/
             move32();
-            st->hHQ_core->crest_mod_lp_q = Q29;
-            move16();
         }
     }
 
diff --git a/lib_enc/hq_core_enc_fx.c b/lib_enc/hq_core_enc_fx.c
index 4d26d0a5c13f1d201ee64a7787f4b51f0d8a8706..faef4c1e0e99888c1480cef1ffcdd8d4ade86135 100644
--- a/lib_enc/hq_core_enc_fx.c
+++ b/lib_enc/hq_core_enc_fx.c
@@ -372,8 +372,12 @@ void HQ_core_enc_init_fx(
 #ifdef MSAN_FIX
     hHQ_core->crest_lp_fx = HQ_CREST_THRESHOLD_FX;
     move32();
+    hHQ_core->crest_lp_q = Q28;
+    move16();
     hHQ_core->crest_mod_lp_fx = HQ_CREST_MOD_THRESHOLD_FX;
     move32();
+    hHQ_core->crest_mod_lp_q = Q29;
+    move16();
 #endif
 
     return;