diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c
index 8b5403a4..0390350c 100644
--- a/src/graphics/graphics.c
+++ b/src/graphics/graphics.c
@@ -528,6 +528,10 @@ next:
 
   // Start a new batch
   if (!batch) {
+    if (state.batchCount >= MAX_BATCHES) {
+      lovrGraphicsFlush();
+    }
+
     float* transforms = lovrGraphicsMapBuffer(STREAM_TRANSFORM, MAX_DRAWS);
     Color* colors = lovrGraphicsMapBuffer(STREAM_COLOR, MAX_DRAWS);