diff --git a/lib_com/options.h b/lib_com/options.h
index 9a2e6fbaf96b3a67f50185db9294af1ee28cf02f..9cbf8bc3389180a366ef602087afc6762a7312fe 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -154,6 +154,7 @@
 #define FIX_337_TDREND_INTP                             /* Issue 337: TD renderer interpolation threshold set too low */
 
 #define FIX_310_TD_REND_DELAY                           /* Adding HRTF delay being read from ROM/Binary file, fix rounding for delay compensation in renderer */
+#define FIX_334_DEBUG_BE_STEREO_SWITCHING               /* FhG: Fix non-BE issue for stereo switching when DEBUGGING is enabled */
 
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c
index 17d91a31d5fbdb6abb3347f077b3ddf2d6ec8f44..96cb8fba0b577f0aa3191d9f4db21fc655c0e363 100644
--- a/lib_enc/ivas_cpe_enc.c
+++ b/lib_enc/ivas_cpe_enc.c
@@ -315,7 +315,11 @@ ivas_error ivas_cpe_enc(
         if ( hCPE->element_brate != hCPE->last_element_brate && st_ivas->hMCT == NULL )
         {
 #ifdef DEBUGGING
+#ifndef FIX_334_DEBUG_BE_STEREO_SWITCHING
             hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->stereo_mode_cmdl;
+#else
+            hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->mdct_stereo_mode_cmdl;
+#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 ) && ( st_ivas->nchan_transport == 2 ) );