diff --git a/lib_com/options.h b/lib_com/options.h
index c9c5644f935a5d8d62b0e71408d59ef013f4704c..395edd9b41326c3b95d3c902196381c74a5c5b41 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -192,7 +192,7 @@
 #define NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS /* Nokia: issue 1339: Apply scaling to the object-part of OMASA for binaural rendering in IVAS_rend. */
 #define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING         /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */
 #define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */
-
+#define FIX_1411_IGF_CRASH_BW_SWITCHING                 /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/
 
 // object-editing feature porting
 #define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features
diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c
index 130feca427783c8573223b1f58c782bab3e077b0..0ab918ac762b5352bb2ae13e141eafe937a317d7 100644
--- a/lib_enc/ivas_cpe_enc.c
+++ b/lib_enc/ivas_cpe_enc.c
@@ -558,47 +558,59 @@ ivas_error ivas_cpe_enc(
      * Core codec configuration
      *----------------------------------------------------------------*/
 
-    if ( hCPE->element_mode == IVAS_CPE_MDCT && st_ivas->hMCT == NULL )
+#ifdef FIX_1411_IGF_CRASH_BW_SWITCHING
+    if ( !( sts[0]->core_brate == SID_2k40 || sts[0]->core_brate == FRAME_NO_DATA ) ) /* Reconfigurations not needed with DTX*/
     {
-        /* set coded BW for MDCT stereo */
-        set_bw_stereo( hCPE );
-
-        /* reconfiguration of MDCT stereo */
-        if ( sts[0]->bwidth != sts[0]->last_bwidth || ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->last_element_mode != hCPE->element_mode ) && sts[0]->bwidth != max_bwidth ) )
+#endif
+        if ( hCPE->element_mode == IVAS_CPE_MDCT && st_ivas->hMCT == NULL )
         {
-            initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, sts[0]->bwidth, 0, NULL, 0 );
-            hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
+            /* set coded BW for MDCT stereo */
+            set_bw_stereo( hCPE );
 
-            if ( hCPE->element_brate <= MAX_MDCT_ITD_BRATE && ivas_format == STEREO_FORMAT )
+            /* reconfiguration of MDCT stereo */
+            if ( sts[0]->bwidth != sts[0]->last_bwidth || ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->last_element_mode != hCPE->element_mode ) && sts[0]->bwidth != max_bwidth ) )
             {
-                if ( ( error = initMdctItdHandling( hCPE->hStereoMdct, input_Fs ) ) != IVAS_ERR_OK )
+                initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, sts[0]->bwidth, 0, NULL, 0 );
+                hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
+
+                if ( hCPE->element_brate <= MAX_MDCT_ITD_BRATE && ivas_format == STEREO_FORMAT )
                 {
-                    return error;
+                    if ( ( error = initMdctItdHandling( hCPE->hStereoMdct, input_Fs ) ) != IVAS_ERR_OK )
+                    {
+                        return error;
+                    }
                 }
             }
         }
-    }
 
-    /* IGF reconfiguration */
-    for ( n = 0; n < n_CoreChannels; n++ )
-    {
-        if ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->element_mode != hCPE->last_element_mode || ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) || sts[n]->last_bwidth != sts[n]->bwidth ) && ( n == 0 || hCPE->element_mode == IVAS_CPE_MDCT ) )
+        /* IGF reconfiguration */
+        for ( n = 0; n < n_CoreChannels; n++ )
         {
-            int16_t igf;
-            int16_t bw;
+            if ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->element_mode != hCPE->last_element_mode || ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) || sts[n]->last_bwidth != sts[n]->bwidth
+#ifdef FIX_1411_IGF_CRASH_BW_SWITCHING
+                   || ( sts[n]->last_core_brate == SID_2k40 || sts[n]->last_core_brate == FRAME_NO_DATA )
+#endif
+                       ) &&
+                 ( n == 0 || hCPE->element_mode == IVAS_CPE_MDCT ) )
+            {
+                int16_t igf;
+                int16_t bw;
 
-            bw = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? sts[n]->bwidth : max_bwidth;
-            igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->rf_mode );
+                bw = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? sts[n]->bwidth : max_bwidth;
+                igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->rf_mode );
 #ifdef FIX_1413_IGF_INIT_PRINTOUT
-            if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )
+                if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )
 #else
             if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )
 #endif
-            {
-                return error;
+                {
+                    return error;
+                }
             }
         }
+#ifdef FIX_1411_IGF_CRASH_BW_SWITCHING
     }
+#endif
 
     /* set ACELP@12k8 / ACELP@16k flag for flexible ACELP core */
     for ( n = 0; n < n_CoreChannels; n++ )