diff --git a/glamor/glamor_trapezoid.c b/glamor/glamor_trapezoid.c
index 57a178cb6..7c934e346 100644
--- a/glamor/glamor_trapezoid.c
+++ b/glamor/glamor_trapezoid.c
@@ -934,6 +934,9 @@ NTRAPS_LOOP_AGAIN:
 				traps_not_completed -= traps_count;
 				glamor_flush_composite_triangles(screen);
 				goto NTRAPS_LOOP_AGAIN;
+			} else {
+				ptrap = traps;
+				traps_count = ntrap;
 			}
 
 			pbox++;