diff --git a/src/intel/compiler/brw_fs_scoreboard.cpp b/src/intel/compiler/brw_fs_scoreboard.cpp
index 24183570da7..c287fd62a5c 100644
--- a/src/intel/compiler/brw_fs_scoreboard.cpp
+++ b/src/intel/compiler/brw_fs_scoreboard.cpp
@@ -1227,7 +1227,10 @@ namespace {
    {
       /* XXX - Use bin-packing algorithm to assign hardware SBIDs optimally in
        *       shaders with a large number of SEND messages.
+       *
+       * XXX - Use 32 SBIDs on Xe2+ while in large GRF mode.
        */
+      const unsigned num_sbids = 16;
 
       /* Allocate an unordered dependency ID to hardware SBID translation
        * table with as many entries as instructions there are in the shader,
@@ -1246,7 +1249,7 @@ namespace {
             const dependency &dep = deps0[ip][i];
 
             if (dep.unordered && ids[dep.id] == ~0u)
-               ids[dep.id] = (next_id++) & 0xf;
+               ids[dep.id] = (next_id++) & (num_sbids - 1);
 
             add_dependency(ids, deps1[ip], dep);
          }