diff --git a/.pick_status.json b/.pick_status.json
index 3bc50a6c5f3..a91c2bf333f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1994,7 +1994,7 @@
         "description": "llvmpipe: disable conditional rendering mem for blits",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
index b42606c2924..729656721e4 100644
--- a/src/gallium/drivers/llvmpipe/lp_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
@@ -191,7 +191,12 @@ lp_blit(struct pipe_context *pipe,
    util_blitter_save_render_condition(lp->blitter, lp->render_cond_query,
                                       lp->render_cond_cond,
                                       lp->render_cond_mode);
+
+   void *render_cond_buffer = lp->render_cond_buffer;
+   if (!blit_info->render_condition_enable)
+      lp->render_cond_buffer = NULL;
    util_blitter_blit(lp->blitter, &info, NULL);
+   lp->render_cond_buffer = render_cond_buffer;
 }