diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 8f8cef2f..5c17a8f4 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -1768,7 +1768,8 @@ static bool gen3_rectangle_begin(struct sna *sna,
 		}
 	}
 
-	if (sna->kgem.nbatch == 2 + state->last_vertex_offset) {
+	if (sna->kgem.nbatch == 2 + state->last_vertex_offset &&
+	    !op->need_magic_ca_pass) {
 		state->vertex_offset = state->last_vertex_offset;
 	} else {
 		state->vertex_offset = sna->kgem.nbatch;