diff --git a/lib_com/options.h b/lib_com/options.h
index e40014289481214a13464f905ecf5097ee312430..60456889810b44110cbbefda025ddd902df08eba 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -201,6 +201,7 @@
 #define NONBE_FIX_855_JBM_FLUSH_OFFSET                  /* FhG: issue #855: add missing switch here for the code in JBM flushing  */
 #define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */
 #define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */
+#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 40966d0c24b915ad7025925be79fcdc6be65c2c4..73eb0117e6bc49b7535f148dbe93effb84f83d2f 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -2101,7 +2101,11 @@ int16_t ivas_jbm_dec_get_num_tc_channels(
         {
             num_tc = CPE_CHANNELS;
         }
+#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA
+        if ( num_tc == 3 )
+#else
         if ( ( st_ivas->sba_planar && num_tc >= 3 ) || ( num_tc == 3 ) )
+#endif
         {
             num_tc++;
         }