diff --git a/lib_com/options.h b/lib_com/options.h
index 07f50312118193ae0fe44f43ed39b6073976d3b7..7731646a8bb2c1a00c33c5f36a2ba084626cfa1b 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -180,6 +180,7 @@
 #define NONBE_1273_ISM_METADATA_COUNTER                 /* VA: FLP issue 1273: fix counter overflow in ISM metadata encoder */
 #define NONBE_FIX_GSC_BSTR                              /* VA: issue 1264 FLP (1189 BASOP): Fix bitstream synchronization between encoder and decoder in ACELP GSC in OMASA */
 #define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */
+#define NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH           /* FhG: issue 708: fix crash in OSBA BR switching with long test vectors */
 
 
 #define NONBE_1319_M2R_PRECISION_ALIGN                  /* Nokia: bring updates from PC code related to OMASA masa2total ratios */
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
index 470cd6182b16e4f2d3b200e178e9210f4d6b0884..ac4e155b8ecc7ad80b9b5b4f7242519cc41acb54 100644
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -296,7 +296,11 @@ ivas_error ivas_sba_dec_reconfigure(
             }
         }
 
+#ifdef NONBE_FIX_708_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 db5e9d0d42567ef797da25eb7eef586d88e4af58..3c186cc0166c4ff745d0032486f1be1afb274dfd 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_708_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." );
     }