diff --git a/lib_enc/ivas_cpe_enc_fx.c b/lib_enc/ivas_cpe_enc_fx.c
index a05493aa4680962e0f7a716c29863b6d55b20bda..d020b398ac72f7f676b33a898c6e48a8b73f6b92 100644
--- a/lib_enc/ivas_cpe_enc_fx.c
+++ b/lib_enc/ivas_cpe_enc_fx.c
@@ -329,6 +329,7 @@ ivas_error ivas_cpe_enc_fx(
                                        &q_band_energies_LR, NULL, NULL, NULL, Q_inp, Q_buffer, Q_add, &front_create_flag ) ),
                IVAS_ERR_OK ) )
     {
+        pop_wmops();
         return error;
     }
 
@@ -362,6 +363,7 @@ ivas_error ivas_cpe_enc_fx(
      *----------------------------------------------------------------*/
     IF( ( error = stereo_memory_enc_fx( hCPE, input_Fs, max_bwidth, ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )
     {
+        pop_wmops();
         return error;
     }
 
@@ -372,6 +374,7 @@ ivas_error ivas_cpe_enc_fx(
 
     IF( ( error = stereo_set_tdm_fx( hCPE, input_frame, sts[1]->q_inp32 ) ) != IVAS_ERR_OK )
     {
+        pop_wmops();
         return error;
     }
 
@@ -917,6 +920,7 @@ ivas_error ivas_cpe_enc_fx(
         move16();
         IF( error != IVAS_ERR_OK )
         {
+            pop_wmops();
             return error;
         }
     }
@@ -991,6 +995,7 @@ ivas_error ivas_cpe_enc_fx(
             igf = getIgfPresent_fx( sts[n]->element_mode, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), sts[n]->max_bwidth, sts[n]->rf_mode ); /* Q0 */
             IF( ( error = IGF_Reconfig_fx( &sts[n]->hIGFEnc, igf, 0, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), sts[n]->max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )
             {
+                pop_wmops();
                 return error;
             }
         }
@@ -1019,6 +1024,7 @@ ivas_error ivas_cpe_enc_fx(
             {
                 IF( ( error = initMdctItdHandling_fx( hCPE->hStereoMdct, input_Fs ) ) != IVAS_ERR_OK )
                 {
+                    pop_wmops();
                     return error;
                 }
             }
@@ -1195,6 +1201,7 @@ ivas_error ivas_cpe_enc_fx(
     }
     IF( NE_32( ( error = ivas_core_enc_fx( NULL, hCPE, st_ivas->hMCT, n_CoreChannels, old_inp_12k8_16fx, old_inp_16k_16fx, Q_new, ener_fx, A_fx, Aw_fx, epsP_fx, epsP_fx_q, lsp_new_fx, lsp_mid_fx, vad_hover_flag, attack_flag, realBuffer_fx, imagBuffer_fx, q_re_im_buf, old_wsp_fx, e_old_wsp, loc_harm, cor_map_sum_fx, vad_flag_dtx, enerBuffer_fx, enerBuffer_fx_exp, fft_buff_fx, tdm_SM_or_LRTD_Pri, ivas_format, 0 ) ), IVAS_ERR_OK ) )
     {
+        pop_wmops();
         return error;
     }