diff --git a/src/panfrost/vulkan/csf/panvk_vX_queue.c b/src/panfrost/vulkan/csf/panvk_vX_queue.c
index 8ff6dcebf13..15620bd27de 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_queue.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_queue.c
@@ -758,6 +758,7 @@ panvk_per_arch(queue_finish)(struct panvk_queue *queue)
 {
    struct panvk_device *dev = to_panvk_device(queue->vk.base.device);
 
+   cleanup_queue(queue);
    destroy_group(queue);
    cleanup_tiler(queue);
    drmSyncobjDestroy(dev->vk.drm_fd, queue->syncobj_handle);