diff --git a/.pick_status.json b/.pick_status.json
index ea255893a6a..3c751cd2db5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5548,7 +5548,7 @@
         "description": "iris/bufmgr: Handle NULL bufmgr in iris_bufmgr_get_for_fd",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "7557f1605968c39d680545d5b8457d17eea3b922"
     },
diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index a2f60f175af..f470856cf86 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -1940,7 +1940,8 @@ iris_bufmgr_get_for_fd(struct gen_device_info *devinfo, int fd, bool bo_reuse)
    }
 
    bufmgr = iris_bufmgr_create(devinfo, fd, bo_reuse);
-   list_addtail(&bufmgr->link, &global_bufmgr_list);
+   if (bufmgr)
+      list_addtail(&bufmgr->link, &global_bufmgr_list);
 
  unlock:
    mtx_unlock(&global_bufmgr_list_mutex);