diff --git a/src/asahi/vulkan/hk_cmd_buffer.c b/src/asahi/vulkan/hk_cmd_buffer.c
index 36ea855d94b..422ebd53bed 100644
--- a/src/asahi/vulkan/hk_cmd_buffer.c
+++ b/src/asahi/vulkan/hk_cmd_buffer.c
@@ -143,7 +143,12 @@ hk_reset_cmd_buffer(struct vk_command_buffer *vk_cmd_buffer,
    cmd->current_cs.post_gfx = NULL;
    cmd->current_cs.pre_gfx = NULL;
 
-   /* TODO: clear pool! */
+   assert(!cmd->in_meta);
+   cmd->geom_indirect = 0;
+   cmd->geom_index_buffer = 0;
+   cmd->geom_index_count = 0;
+   cmd->geom_instance_count = 0;
+   cmd->uses_heap = false;
 
    memset(&cmd->state, 0, sizeof(cmd->state));
 }