diff --git a/applications/disturb2/designs/disturb2_unb2b_station/src/vhdl/disturb2_unb2b_station.vhd b/applications/disturb2/designs/disturb2_unb2b_station/src/vhdl/disturb2_unb2b_station.vhd
index 5196dec8760d16e753405a7fcd2b0e70add4cb61..c77bf9b4350821afe2818a04009d4d17fd8b6ba1 100644
--- a/applications/disturb2/designs/disturb2_unb2b_station/src/vhdl/disturb2_unb2b_station.vhd
+++ b/applications/disturb2/designs/disturb2_unb2b_station/src/vhdl/disturb2_unb2b_station.vhd
@@ -799,8 +799,9 @@ BEGIN
     ram_st_xsq_cipo                              => ram_st_xsq_cipo 
   );
 
+  -- Use gn_id = ID MOD 32, so map ID to 0:31 range (c_sdp_W_gn_id = 5)
+  gn_id <= ID(c_disturb_W_gn_id-1 DOWNTO 0);
 
-  gn_id    <= ID(c_disturb_W_gn_id-1 DOWNTO 0);
   -----------------------------------------------------------------------------
   -- disturb nodes
   -----------------------------------------------------------------------------
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
index ed8aa99838b2caecf441bcca6ed632ee80d56b38..a5f605b3520af98c62aa61a552bad970cc807c3a 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
@@ -797,7 +797,9 @@ BEGIN
   );
 
 
-  gn_id    <= ID(c_sdp_W_gn_id-1 DOWNTO 0);
+  -- Use gn_id = ID MOD 32, so map ID to 0:31 range (c_sdp_W_gn_id = 5)
+  gn_id <= ID(c_sdp_W_gn_id-1 DOWNTO 0);
+
   -----------------------------------------------------------------------------
   -- sdp nodes
   -----------------------------------------------------------------------------
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd
index b4b4601ea9be41cef8a0cf7262862d7bc412fe5f..1ef4c3b4ab9444431c638f49ef5a2d7289010c23 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd
@@ -763,8 +763,9 @@ BEGIN
     ram_st_xsq_cipo                              => ram_st_xsq_cipo 
   );
 
+  -- Use gn_id = ID MOD 32, so map ID to 0:31 range (c_sdp_W_gn_id = 5)
+  gn_id <= ID(c_sdp_W_gn_id-1 DOWNTO 0);
 
-  gn_id    <= ID(c_sdp_W_gn_id-1 DOWNTO 0);
   -----------------------------------------------------------------------------
   -- sdp nodes
   -----------------------------------------------------------------------------