diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index 457af771c72..1c1fe480577 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -570,6 +570,9 @@ pvr_load_op_constants_create_and_upload(struct pvr_cmd_buffer *cmd_buffer,
    assert(load_op->is_hw_object);
    assert(hw_render->color_init_count == 1);
 
+   assert(vk_format_get_blocksize(attachment->vk_format) <=
+          sizeof(hw_clear_value));
+
    /* FIXME: add support for VK_ATTACHMENT_LOAD_OP_LOAD. */
    assert(color_init->op == VK_ATTACHMENT_LOAD_OP_CLEAR);
 
@@ -578,9 +581,6 @@ pvr_load_op_constants_create_and_upload(struct pvr_cmd_buffer *cmd_buffer,
                           clear_value->color,
                           hw_clear_value);
 
-   if (vk_format_get_blocksize(attachment->vk_format) > 4)
-      pvr_finishme("Handle clear color greater than 32 bits.");
-
    result = pvr_cmd_buffer_upload_general(cmd_buffer,
                                           &hw_clear_value[0],
                                           sizeof(hw_clear_value),