diff --git a/.pick_status.json b/.pick_status.json
index d054e0d5da4..456fff9c58d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5404,7 +5404,7 @@
         "description": "anv: Fix address bit masking for indirect SBTs",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ce68824bdfb05379f0e682165588528a11b05214",
         "notes": null
diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c
index 3ff42e8cc96..b91c8da4e87 100644
--- a/src/intel/vulkan/genX_cmd_compute.c
+++ b/src/intel/vulkan/genX_cmd_compute.c
@@ -998,7 +998,7 @@ mi_build_sbt_entry(struct mi_builder *b,
 {
    return mi_ior(b,
                  mi_iand(b, mi_mem64(anv_address_from_u64(addr_field_addr)),
-                            mi_imm(BITFIELD64_BIT(49) - 1)),
+                            mi_imm(BITFIELD64_MASK(48))),
                  mi_ishl_imm(b, mi_mem32(anv_address_from_u64(stride_field_addr)),
                                 48));
 }