diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c
index c3c40a55a427b6ed6f6ea275c79ed752cf3f60da..9340d34cbf165ba4db9b05f75cf771993d31dd1b 100644
--- a/lib_enc/ivas_cpe_enc.c
+++ b/lib_enc/ivas_cpe_enc.c
@@ -355,6 +355,21 @@ ivas_error ivas_cpe_enc(
         {
 #ifdef DEBUGGING
             hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->mdct_stereo_mode_cmdl;
+#ifdef DEBUG_FORCE_MDCT_STEREO_MODE
+            /*set all other members to defined states */
+            hCPE->hStereoMdct->fDualMono = 0;
+            hCPE->hStereoMdct->fMSstereo = 0;
+
+            if (  hCPE->hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_LR )
+            {
+                hCPE->hStereoMdct->fDualMono = 1;
+            }
+             else if (  hCPE->hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_MS )
+            {
+                hCPE->hStereoMdct->fMSstereo = 1;
+            }
+#endif
+
 #endif
             initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, max_bwidth, 0, NULL, 0 );
             hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c
index d74f21d8e869281e8c91d8d13ce923f2de3686e6..0343b1ebf5b699eacc9d2485608ed80927e10efa 100644
--- a/lib_enc/ivas_stereo_mdct_core_enc.c
+++ b/lib_enc/ivas_stereo_mdct_core_enc.c
@@ -189,15 +189,7 @@ void stereo_mdct_core_enc(
 
     if ( hCPE->hCoreCoder[0]->igf )
     {
-#ifdef DEBUGGING
-        int16_t orig_mdct_stereo_mode_cmdl = hCPE->hStereoMdct->mdct_stereo_mode_cmdl;
-        hCPE->hStereoMdct->mdct_stereo_mode_cmdl = SMDCT_MS_DECISION;
-#endif
         initMdctStereoEncData( hCPE->hStereoMdct, STEREO_FORMAT, IVAS_CPE_MDCT, hCPE->element_brate, hCPE->hCoreCoder[0]->bwidth, hCPE->hCoreCoder[0]->igf, hCPE->hCoreCoder[0]->hIGFEnc->igfData.igfInfo.grid, 0 );
-#ifdef DEBUGGING
-        hCPE->hStereoMdct->mdct_stereo_mode_cmdl = orig_mdct_stereo_mode_cmdl;
-#endif
-
         stereo_mdct_init_igf_start_band( &( hCPE->hStereoMdct->stbParamsTCX20 ), 1.0f, hCPE->hCoreCoder[0]->bwidth, hCPE->element_brate );
         stereo_mdct_init_igf_start_band( &( hCPE->hStereoMdct->stbParamsTCX10 ), 0.5f, hCPE->hCoreCoder[0]->bwidth, hCPE->element_brate );
         stereo_mdct_init_igf_start_band( &( hCPE->hStereoMdct->stbParamsTCX20afterACELP ), 1.25f, hCPE->hCoreCoder[0]->bwidth, hCPE->element_brate );
diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc.c
index 38e537713df832150276bc2725f88345d704e2df..d21244c202375146e686d9f89f8fa935ae24342b 100644
--- a/lib_enc/ivas_stereo_mdct_stereo_enc.c
+++ b/lib_enc/ivas_stereo_mdct_stereo_enc.c
@@ -1145,21 +1145,6 @@ void initMdctStereoEncData(
 
     set_s( hStereoMdct->IGFStereoMode, -1, 2 );
 
-#ifdef DEBUG_FORCE_MDCT_STEREO_MODE
-    /*set all other members to defined states */
-    hStereoMdct->fDualMono = 0;
-    hStereoMdct->fMSstereo = 0;
-
-    if ( hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_LR )
-    {
-        hStereoMdct->fDualMono = 1;
-    }
-    else if ( hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_MS )
-    {
-        hStereoMdct->fMSstereo = 1;
-    }
-#endif
-
     hStereoMdct->split_ratio = SMDCT_EQUAL_RATIO_RANGE;
     set_s( hStereoMdct->global_ild, SMDCT_ILD_RANGE >> 1, 2 );