diff --git a/lib_com/options.h b/lib_com/options.h
index 964382c3770b6aa8ed1b5e19d1f6102011865887..b97c75dee9ab8cb9b06a1c47d3436a6770e44c8f 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -187,6 +187,7 @@
 #define OSBA_ROOM_IR
 #endif
 #define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */
+#define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT              /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"   */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 77764fb53fdddff01c28e23ae289fa0e74780341..943e1e694b05a84b0077bc1eaec8d80bdc9ca3ac 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -296,7 +296,11 @@ ivas_error ivas_jbm_dec_tc(
                 num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( st_ivas->sba_analysis_order, ivas_total_brate, st_ivas->last_active_ivas_total_brate );
                 ivas_sba_mix_matrix_determiner( st_ivas->hSpar, p_output, st_ivas->bfi, nchan_remapped, output_frame, num_md_sub_frames );
             }
+#ifdef NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT
+            else if ( st_ivas->renderer_type != RENDERER_DISABLE )
+#else
             else
+#endif
             {
                 ivas_spar_dec_agc_pca( st_ivas, p_output, output_frame );
             }