diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c
index a7cb906b861..df6ea640d1b 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -341,6 +341,7 @@ batch_flush(struct fd_batch *batch) assert_dt
    batch_flush_dependencies(batch);
 
    batch_reset_resources(batch);
+   fd_bc_free_key(batch);
    batch->flushed = true;
 
    if (batch == batch->ctx->batch)
@@ -353,9 +354,6 @@ batch_flush(struct fd_batch *batch) assert_dt
 
    debug_assert(batch->reference.count > 0);
 
-   /* Must come after fd_gmem_render_tiles, since that uses the key. */
-   fd_bc_free_key(batch);
-
    cleanup_submit(batch);
    fd_batch_unlock_submit(batch);
 }