diff --git a/.pick_status.json b/.pick_status.json
index 3b74f3fa0a4..fcb2ccc0ebc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -193,7 +193,7 @@
         "description": "panvk: Use more reliable assert for UBO pushing",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c
index 764f1455ddc..26820fdd82b 100644
--- a/src/panfrost/vulkan/panvk_vX_meta_clear.c
+++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c
@@ -70,8 +70,7 @@ panvk_meta_clear_color_attachment_shader(struct panfrost_device *pdev,
    GENX(pan_shader_compile)(b.shader, &inputs, &binary, shader_info);
 
    /* Make sure UBO words have been upgraded to push constants */
-   assert(shader_info->ubo_count == 1);
-   assert(shader_info->push.count == 4);
+   assert(shader_info->ubo_mask == 0);
 
    mali_ptr shader =
       pan_pool_upload_aligned(bin_pool, binary.data, binary.size,
@@ -138,8 +137,7 @@ panvk_meta_clear_zs_attachment_shader(struct panfrost_device *pdev,
    GENX(pan_shader_compile)(b.shader, &inputs, &binary, shader_info);
 
    /* Make sure UBO words have been upgraded to push constants */
-   assert(shader_info->ubo_count == 1);
-   assert(shader_info->push.count == 2);
+   assert(shader_info->ubo_mask == 0);
 
    mali_ptr shader =
       pan_pool_upload_aligned(bin_pool, binary.data, binary.size,