diff --git a/.pick_status.json b/.pick_status.json
index 7f539ba95f2..d47794938e1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -904,7 +904,7 @@
         "description": "iris: fix a crash in disable_rb_aux_buffer",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ca96f8517cc996915778c6d63d753f4cce63c555",
         "notes": null
diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c
index 07df4932a23..d88db41a57d 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -61,7 +61,8 @@ disable_rb_aux_buffer(struct iris_context *ice,
       struct pipe_surface *surf = &cso_fb->base.cbufs[i];
       struct iris_resource *rb_res = (void *) surf->texture;
 
-      if (rb_res->bo == tex_res->bo &&
+      if (rb_res != NULL &&
+          rb_res->bo == tex_res->bo &&
           surf->level >= min_level &&
           surf->level < min_level + num_levels) {
          found = draw_aux_buffer_disabled[i] = true;