diff --git a/.pick_status.json b/.pick_status.json
index 8369dfda65a..5a6d1a3df99 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -8704,7 +8704,7 @@
         "description": "radv/amdgpu: Use correct NOP packets when unchaining a CS",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index 374311e4713..1db8d566fda 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -571,12 +571,13 @@ radv_amdgpu_cs_unchain(struct radeon_cmdbuf *cs)
       return;
 
    assert(cs->cdw <= cs->max_dw + 4);
+   const uint32_t nop_packet = get_nop_packet(acs);
 
    acs->chained_to = NULL;
-   cs->buf[cs->cdw - 4] = PKT3_NOP_PAD;
-   cs->buf[cs->cdw - 3] = PKT3_NOP_PAD;
-   cs->buf[cs->cdw - 2] = PKT3_NOP_PAD;
-   cs->buf[cs->cdw - 1] = PKT3_NOP_PAD;
+   cs->buf[cs->cdw - 4] = nop_packet;
+   cs->buf[cs->cdw - 3] = nop_packet;
+   cs->buf[cs->cdw - 2] = nop_packet;
+   cs->buf[cs->cdw - 1] = nop_packet;
 }
 
 static bool