diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c
index d9abbc8a798..7ea666554ee 100644
--- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c
+++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c
@@ -921,15 +921,14 @@ panvk_per_arch(CmdWaitEvents)(VkCommandBuffer commandBuffer,
 static VkResult
 panvk_reset_cmdbuf(struct panvk_cmd_buffer *cmdbuf)
 {
-   struct panfrost_device *pdev = &cmdbuf->device->physical_device->pdev;
-
    cmdbuf->record_result = VK_SUCCESS;
 
    list_for_each_entry_safe(struct panvk_batch, batch, &cmdbuf->batches, node) {
       list_del(&batch->node);
       util_dynarray_fini(&batch->jobs);
-      if (!pan_is_bifrost(pdev))
-         panfrost_bo_unreference(batch->tiler.ctx.midgard.polygon_list);
+#if PAN_ARCH <= 5
+      panfrost_bo_unreference(batch->tiler.ctx.midgard.polygon_list);
+#endif
 
       util_dynarray_fini(&batch->event_ops);
 
@@ -950,7 +949,6 @@ panvk_reset_cmdbuf(struct panvk_cmd_buffer *cmdbuf)
 static void
 panvk_destroy_cmdbuf(struct panvk_cmd_buffer *cmdbuf)
 {
-   struct panfrost_device *pdev = &cmdbuf->device->physical_device->pdev;
    struct panvk_device *device = cmdbuf->device;
 
    list_del(&cmdbuf->pool_link);
@@ -958,8 +956,9 @@ panvk_destroy_cmdbuf(struct panvk_cmd_buffer *cmdbuf)
    list_for_each_entry_safe(struct panvk_batch, batch, &cmdbuf->batches, node) {
       list_del(&batch->node);
       util_dynarray_fini(&batch->jobs);
-      if (!pan_is_bifrost(pdev))
-         panfrost_bo_unreference(batch->tiler.ctx.midgard.polygon_list);
+#if PAN_ARCH <= 5
+      panfrost_bo_unreference(batch->tiler.ctx.midgard.polygon_list);
+#endif
 
       util_dynarray_fini(&batch->event_ops);