diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index bc4497e57d8..aa8ba1882ce 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -685,6 +685,9 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
 
    assert(_mesa_is_user_fbo(fb));
 
+   /* we're changing framebuffer fields here */
+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+
    numImages = 0;
    fb->Width = 0;
    fb->Height = 0;