diff --git a/src/gallium/auxiliary/util/u_vbuf.c b/src/gallium/auxiliary/util/u_vbuf.c
index 4775591abad..6f4e9124a33 100644
--- a/src/gallium/auxiliary/util/u_vbuf.c
+++ b/src/gallium/auxiliary/util/u_vbuf.c
@@ -1490,6 +1490,9 @@ void u_vbuf_draw_vbo(struct u_vbuf *mgr, const struct pipe_draw_info *info,
          if (new_draw.start == ~0u || !new_draw.count || !new_info.instance_count)
             goto cleanup;
       }
+   } else {
+      if ((!indirect && !new_draw.count) || !new_info.instance_count)
+         goto cleanup;
    }
 
    if (new_info.index_size) {