diff --git a/lib_com/options.h b/lib_com/options.h
index aa2bbfdd3fc1a5f4dea125e647ec8577bfd1a7a1..dd17c85522333eae08ef721a43d78484d4510843 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -211,6 +211,9 @@
 #define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */
 #define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */
 
+
+#define NONBE_FIX_979_OSBA_STEREO_5MS                    /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */
+
 /* #################### End BASOP porting switches ############################ */
 
 /* clang-format on */
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 290118cc5c691e6c83e0b881ab4330eed3d596f7..6f8d16aab81933d235a23186c3a6af4f1bc82b1c 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -984,7 +984,12 @@ ivas_error ivas_jbm_dec_render(
     {
         for ( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )
         {
+
+#ifdef NONBE_FIX_979_OSBA_STEREO_5MS
+            p_tc[n] = &p_output[n][st_ivas->hTcBuffer->n_samples_rendered];
+#else
             p_tc[n] = p_output[n];
+#endif
         }
 
         for ( n = 0; n < MAX_TRANSPORT_CHANNELS + MAX_NUM_OBJECTS; n++ )
diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec.c
index 2800aedd849a0ff115c417b23010c648b07dfdd9..9437bdb551112a4678206b1514078e676158bd90 100644
--- a/lib_dec/ivas_osba_dec.c
+++ b/lib_dec/ivas_osba_dec.c
@@ -271,10 +271,25 @@ ivas_error ivas_osba_render_sf(
         p_output_ism[n] = &output_ism[n][0];
     }
 
-    for ( n = 0; n < st_ivas->nchan_ism; n++ )
+#ifdef NONBE_FIX_979_OSBA_STEREO_5MS
+    if ( !st_ivas->hDecoderConfig->Opt_tsm )
     {
+        int16_t tc_offset;
+        tc_offset = st_ivas->hTcBuffer->n_samples_rendered;
+#endif
+        for ( n = 0; n < st_ivas->nchan_ism; n++ )
+        {
+
+#ifdef NONBE_FIX_979_OSBA_STEREO_5MS
+            mvr2r( &p_output[n][tc_offset], &output_ism[n][tc_offset], nSamplesAsked );
+#else
         mvr2r( p_output[n], output_ism[n], nSamplesAsked );
+#endif
+        }
+#ifdef NONBE_FIX_979_OSBA_STEREO_5MS
     }
+#endif
+
 
     if ( ( error = ivas_sba_dec_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailableNext, p_output ) ) != IVAS_ERR_OK )
     {
diff --git a/lib_rend/ivas_output_init.c b/lib_rend/ivas_output_init.c
index c9894e4885cb27b9deb6270f474deca4eb86ff9e..11eec0dd733520637cacc71ace52a16b2af360c3 100644
--- a/lib_rend/ivas_output_init.c
+++ b/lib_rend/ivas_output_init.c
@@ -293,6 +293,12 @@ int16_t ivas_get_nchan_buffers_dec(
         {
             nchan_out_buff = max( nchan_out_buff, st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe );
         }
+#ifdef NONBE_FIX_979_OSBA_STEREO_5MS
+        else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )
+        {
+            nchan_out_buff = max( nchan_out_buff, 2 * BINAURAL_CHANNELS + 2 );
+        }
+#endif
         else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
         {
             nchan_out_buff = max( audioCfg2channels( st_ivas->transport_config ), audioCfg2channels( st_ivas->intern_config ) );