diff --git a/lib_com/options.h b/lib_com/options.h
index 2efbe0375ddd6660bb65b4ad5a2733001e6df03d..bea3e2670e5784a62b4637526cd2da2ff5e955ff 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -149,7 +149,7 @@
 #define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */
 #define FIX_245_RANGE_CODER_VOIP_MSAN                   /* Issue 245: fix use-of-uninitialized-value in range coder in VoIP mode */
 #define FIX_235                                         /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */
-/*#define ENV_STAB_FIX*/                                    /* Contribution 23: HQ envelope stability memory fix */
+#define ENV_STAB_FIX                                    /* Contribution 23: HQ envelope stability memory fix */
 #define STABILIZE_GIPD                                  /* FhG: Contribution 22: gIPD stabilization */
 
 /* ################## End DEVELOPMENT switches ######################### */
diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c
index 20819ceb272743322dac83d5f8953a15253f3ea3..2d0e26b52c79a23a0968ced15335fa4ba54f570b 100644
--- a/lib_dec/core_switching_dec.c
+++ b/lib_dec/core_switching_dec.c
@@ -449,6 +449,11 @@ ivas_error core_switching_pre_dec(
             st->hHQ_core->prev_ni_ratio = 0.5f;
             set_f( st->hHQ_core->prev_En_sb, 0.0f, NB_SWB_SUBBANDS );
         }
+        else
+        {
+            set_f( st->hHQ_core->old_out, 0, output_frame );
+            set_f( st->hHQ_core->old_outLB, 0, L_FRAME16k );
+        }
 #else
         set_f( st->hHQ_core->old_out, 0, output_frame );
         set_f( st->hHQ_core->old_outLB, 0, L_FRAME16k );