diff --git a/.pick_status.json b/.pick_status.json
index bfa4b896fd1..d1c53867826 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2524,7 +2524,7 @@
         "description": "intel/perf: fix crash when no perf queries are supported",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "ec1fa1d51ff614c19d08c949482b40c060de48c9"
     },
diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/gen_perf.c
index d9f20501512..b9fee6e4d4d 100644
--- a/src/intel/perf/gen_perf.c
+++ b/src/intel/perf/gen_perf.c
@@ -781,7 +781,7 @@ load_oa_metrics(struct gen_perf_config *perf, int fd,
          break;
       }
    }
-   if (perf->fallback_raw_oa_metric == 0)
+   if (perf->fallback_raw_oa_metric == 0 && perf->n_queries > 0)
       perf->fallback_raw_oa_metric = perf->queries[perf->n_queries - 1].oa_metrics_set_id;
 }