diff --git a/lib_com/options.h b/lib_com/options.h
index 7ab9d0374f50a036d595c4faa907fe82a5e8950f..031b3b41ce442acb048dcdb038fe574275da316d 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -113,6 +113,7 @@
 #define FIX_BASOP_2524_MASA_REDUCE_META_BUG             /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */
 #define FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX           /* Nokia: BASOP issue 2520: Fix wrong threshold in ParamBin */
 #define FIX_BASOP_2510_UNNECESSARY_ASSERT               /* Nokia: BASOP issue 2510: Fix by removing assert */
+#define FIX_2515_TDREND_PORT_ERROR_SCALING              /* Nokia: BASOP issue 2515: Fix port error by changing to correct scaling */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_rend/ivas_objectRenderer_hrFilt_fx.c b/lib_rend/ivas_objectRenderer_hrFilt_fx.c
index a9e73afa8488982a201d0fc0414f87c19a383ca2..7b2ebf908717859de29f68e4ee35eb1bfbe20b7b 100644
--- a/lib_rend/ivas_objectRenderer_hrFilt_fx.c
+++ b/lib_rend/ivas_objectRenderer_hrFilt_fx.c
@@ -84,7 +84,11 @@ ivas_error TDREND_REND_RenderSourceHRFilt_fx(
     Scale_sig32( Src_p->hrf_left_prev_fx, Src_p->filterlength, sub( Src_p->hrf_left_prev_e, left_filter_e ) );
     Scale_sig32( hrf_left_delta_fx, Src_p->filterlength, sub( *hrf_left_delta_e, left_filter_e ) );
     Scale_sig32( Src_p->hrf_right_prev_fx, Src_p->filterlength, sub( Src_p->hrf_right_prev_e, right_filter_e ) );
+#ifdef FIX_2515_TDREND_PORT_ERROR_SCALING
+    Scale_sig32( hrf_right_delta_fx, Src_p->filterlength, sub( *hrf_right_delta_e, right_filter_e ) );
+#else
     Scale_sig32( hrf_right_delta_fx, Src_p->filterlength, sub( *hrf_right_delta_e, left_filter_e ) );
+#endif
     Src_p->hrf_left_prev_e = left_filter_e;
     move16();
     *hrf_left_delta_e = left_filter_e;