diff --git a/lib_com/options.h b/lib_com/options.h
index 1190d5be472911456468254054fb299344a5c9f9..d8bed8d76f0922f8cf7a8999309432bf3bc2d6f2 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -183,6 +183,7 @@
 #define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */
 #define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */
 #define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */
+#define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
index d5b5d8ff14e8607fd677d4acf8fd64c4ff6f5d10..2092d7c2dfd6b21ccc9b3b28eec6d3f9e4dedb11 100755
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -325,7 +325,11 @@ ivas_error ivas_sba_dec_reconfigure(
             }
         }
 
+#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH
+        if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) )
+#else
         if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && st_ivas->ivas_format == SBA_FORMAT )
+#endif
         {
             if ( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL )
             {
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index 62ea6dceb8ffac135fa5918806ac43130bd4ef71..a650bf8bd458fe9e64880e6275acce898529bbfd 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -990,7 +990,11 @@ static ivas_error configureEncoder(
     }
 #endif
 
+#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH
+    if ( hEncoderConfig->Opt_PCA_ON && !( ( hEncoderConfig->ivas_format == SBA_FORMAT || hEncoderConfig->ivas_format == SBA_ISM_FORMAT ) && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) )
+#else
     if ( hEncoderConfig->Opt_PCA_ON && !( hEncoderConfig->ivas_format == SBA_FORMAT && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) )
+#endif
     {
         return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "PCA supported at SBA FOA 256 kbps only." );
     }