diff --git a/.pick_status.json b/.pick_status.json
index f34006a6760..479b8af96a3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3334,7 +3334,7 @@
         "description": "panvk: Fix wrong type for sb_mask in CmdSetEvent2",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f8598e599e1ff0031988b863fab35c01d7d6dd20",
         "notes": null
diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_event.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_event.c
index e42f0a7b377..93f26ceecf3 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_event.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_event.c
@@ -72,7 +72,7 @@ panvk_per_arch(CmdSetEvent2)(VkCommandBuffer commandBuffer, VkEvent _event,
 
    for (uint32_t i = 0; i < PANVK_SUBQUEUE_COUNT; i++) {
       struct cs_builder *b = panvk_get_cs_builder(cmdbuf, i);
-      uint16_t sb_mask = deps.src[i].wait_sb_mask;
+      uint32_t sb_mask = deps.src[i].wait_sb_mask;
       struct cs_index sync_addr = cs_scratch_reg64(b, 0);
       struct cs_index seqno = cs_scratch_reg32(b, 2);
       struct cs_index cmp_scratch = cs_scratch_reg32(b, 3);