diff --git a/lib_com/options.h b/lib_com/options.h
index da572db15f2fe868f61f47891b104bea814ffdef..8d06feb495823d3f973511e6a43c1daa1f492557 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -128,6 +128,7 @@
 #define FIX_BASOP_2512_WRONG_SHIFT_IN_DIRAC_CONFIG      /* Nokia: BASOP 2512: Fix wrong division by shift */
 #define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */
 #define FIX_BASOP_2514_EFAP_PORTING_ERROR               /* Nokia: BASOP issue 2514: Fix wrongly ported line */
+#define FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG      /* Nokia: BASOP issue 2516: Fix porting bug in setting planar state for custom layout in renderer */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c
index 937824d8c9661704ceaa193f111034de71ebf5bb..c5a9438932e9194f26f5d945315d6370ec79234a 100644
--- a/lib_rend/lib_rend_fx.c
+++ b/lib_rend/lib_rend_fx.c
@@ -4054,7 +4054,11 @@ static LSSETUP_CUSTOM_STRUCT makeCustomLsSetup(
     move16();
     FOR( i = 0; i < rendCustomLsLayout.num_spk; ++i )
     {
+#ifdef FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG
+        IF( GT_32( L_abs( rendCustomLsLayout.elevation_fx[i] ), EPSILON_FX ) )
+#else
         IF( LT_32( L_abs( rendCustomLsLayout.elevation_fx[i] ), EPSILON_FX ) )
+#endif
         {
             customLs.is_planar_setup = 0;
             move16();