diff --git a/.pick_status.json b/.pick_status.json
index 48d6b989a21..c8944a35687 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -103,7 +103,7 @@
         "description": "freedreno: fix FD_MESA_DEBUG=inorder",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "2c07e03b792d57ae807a6953f0d8ff5f4bcdffd0"
     },
diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c
index 8a757ee96d4..d9c8f9f89a2 100644
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -252,7 +252,7 @@ fd_set_framebuffer_state(struct pipe_context *pctx,
 		}
 
 		fd_batch_reference(&old_batch, NULL);
-	} else {
+	} else if (ctx->batch) {
 		DBG("%d: cbufs[0]=%p, zsbuf=%p", ctx->batch->needs_flush,
 				framebuffer->cbufs[0], framebuffer->zsbuf);
 		fd_batch_flush(ctx->batch);