diff --git a/lib_com/options.h b/lib_com/options.h
index 9fed7783e495ca5ca72a3c495fe8aff4f294ba79..b24ac826732d2dcdf5d72d10e53f96bc66f0491a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -171,4 +171,5 @@
 #define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */
 #define FIX_1301_CORRECT_TD_CNST                /* VA: Fix 1301, correct wrong constant in TD stereo */
 #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 */
 #endif
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
index 65faabdc0b3abb34e8a249702049cf6680fae48c..94f1affde39341bcddfc0bef17a18d030cb3f8c8 100644
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -351,7 +351,12 @@ ivas_error ivas_sba_dec_reconfigure_fx(
         test();
         test();
         test();
+#ifdef NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH
+        test();
+        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) )
+#else
         IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && EQ_32( 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 0475d65c4df62efe3260f73d92c6a53654fc38bc..6035687ed973a6df3d287c0d1eaa20d1864d33ea 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -1095,7 +1095,11 @@ static ivas_error configureEncoder(
     }
 
 
+#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." );
     }