diff --git a/.pick_status.json b/.pick_status.json
index e55cc434e7f..9e9faa9faed 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4954,7 +4954,7 @@
         "description": "mesa: update validation when draw buffer changes",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d04d9da98c9f70ec7db59750558f10dad215b2f4",
         "notes": null
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 2e01157f2ca..baa9c4f5bad 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -33,6 +33,7 @@
 #include "util/glheader.h"
 #include "buffers.h"
 #include "context.h"
+#include "draw_validate.h"
 #include "enums.h"
 #include "fbobject.h"
 #include "framebuffer.h"
@@ -867,6 +868,8 @@ _mesa_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
          }
       }
    }
+
+   _mesa_update_valid_to_render_state(ctx);
 }