diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c
index ec583c889af..9f7124dfdee 100644
--- a/src/gallium/drivers/freedreno/freedreno_gmem.c
+++ b/src/gallium/drivers/freedreno/freedreno_gmem.c
@@ -721,7 +721,7 @@ fd_gmem_render_tiles(struct fd_batch *batch)
       trace_framebuffer_state(&batch->trace, batch->gmem, pfb);
    }
 
-   if (ctx->emit_sysmem_prep && !batch->nondraw) {
+   if (ctx->emit_sysmem_prep && !sysmem) {
       if (fd_autotune_use_bypass(&ctx->autotune, batch) && !FD_DBG(GMEM)) {
          sysmem = true;
       }