diff --git a/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd b/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd
index 8ac8d31ade435feeb70f38398f86798904f57efc..9f4325486501f05467d8bc8a27a75de1326a5875 100644
--- a/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd
+++ b/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd
@@ -129,6 +129,7 @@ ARCHITECTURE str OF node_apertif_unb1_fn_beamformer IS
   CONSTANT c_nof_clk_per_sync            : NATURAL := c_nof_blocks_per_sync * c_block_period;  -- = 800000 * 256
   CONSTANT c_bsn_sync_timeout            : NATURAL := (c_nof_clk_per_sync * 10)/8; -- *10/8 as margin
 
+  CONSTANT c_use_output_clipping         : BOOLEAN  := TRUE;  -- TRUE = beamlet clipping, FALSE = beamlet wrap (see #1860)
   CONSTANT c_use_force                   : BOOLEAN  := TRUE;  -- TRUE to instantiate dp_force module
   CONSTANT c_ram_fringe_stop_addr_w      : POSITIVE := ceil_log2(g_bf.nof_weights);
   CONSTANT c_fs_offset_w                 : POSITIVE := 10;
@@ -286,8 +287,8 @@ BEGIN
       g_lsb_w               => c_fs_quant_lsb_w,               
       g_lsb_round           => TRUE,           
       g_lsb_round_clip      => FALSE,      
-      g_msb_clip            => FALSE,  -- default BF should not clip
-      g_msb_clip_symmetric  => FALSE,  
+      g_msb_clip            => c_use_output_clipping,
+      g_msb_clip_symmetric  => c_use_output_clipping,  
       g_gain_w              => 0,
       g_pipeline_remove_lsb => 1, 
       g_pipeline_remove_msb => 0,