diff --git a/src/gallium/drivers/freedreno/freedreno_batch_cache.c b/src/gallium/drivers/freedreno/freedreno_batch_cache.c
index 98421a0123d..78fc81691f4 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch_cache.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch_cache.c
@@ -436,9 +436,15 @@ batch_from_key(struct fd_batch_cache *cache, struct fd_batch_key *key,
       _mesa_hash_table_search_pre_hashed(cache->ht, hash, key);
 
    if (entry) {
-      free(key);
-      fd_batch_reference(&batch, (struct fd_batch *)entry->data);
-      return batch;
+      fd_batch_reference_locked(&batch, (struct fd_batch *)entry->data);
+
+      if (batch->flushed) {
+         fd_bc_invalidate_batch(batch, false);
+         fd_batch_reference_locked(&batch, NULL);
+      } else {
+         free(key);
+         return batch;
+      }
    }
 
    batch = alloc_batch_locked(cache, ctx, false);