diff --git a/.pick_status.json b/.pick_status.json
index 455fc92d46c..4364bcfab2c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5602,7 +5602,7 @@
         "description": "nir: fix nir_xfb_info buffer_to_stream length",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "19064b8c3a8e0f7b9081a0564f1c7c79a1953d0b"
     },
diff --git a/src/compiler/nir/nir_xfb_info.h b/src/compiler/nir/nir_xfb_info.h
index 301547f3392..424d730abfb 100644
--- a/src/compiler/nir/nir_xfb_info.h
+++ b/src/compiler/nir/nir_xfb_info.h
@@ -57,7 +57,7 @@ typedef struct nir_xfb_info {
    uint8_t streams_written;
 
    nir_xfb_buffer_info buffers[NIR_MAX_XFB_BUFFERS];
-   uint8_t buffer_to_stream[NIR_MAX_XFB_STREAMS];
+   uint8_t buffer_to_stream[NIR_MAX_XFB_BUFFERS];
 
    uint16_t output_count;
    nir_xfb_output_info outputs[0];