diff --git a/.pick_status.json b/.pick_status.json
index 76feee1bce7..d2bfe7c2187 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -814,7 +814,7 @@
         "description": "nvk/mme: Add missing nullcheck in nvk_mme_test_state_state",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "7d6cc15ab81178be7660a27b26626734773c267f",
         "notes": null
diff --git a/src/nouveau/vulkan/nvk_mme.c b/src/nouveau/vulkan/nvk_mme.c
index bbec8760987..7ed6c708516 100644
--- a/src/nouveau/vulkan/nvk_mme.c
+++ b/src/nouveau/vulkan/nvk_mme.c
@@ -79,9 +79,11 @@ nvk_mme_test_state_state(void *_ts, uint16_t addr)
    /* First, look backwards through the expected data that we've already
     * written.  This ensures that mthd() impacts state().
     */
-   for (int32_t i = ts->ei - 1; i >= 0; i--) {
-      if (ts->test->expected[i].mthd == addr)
-         return ts->test->expected[i].data;
+   if (ts->test->expected != NULL) {
+      for (int32_t i = ts->ei - 1; i >= 0; i--) {
+         if (ts->test->expected[i].mthd == addr)
+            return ts->test->expected[i].data;
+      }
    }
 
    /* Now look at init.  We assume the init data is unique */