diff --git a/.pick_status.json b/.pick_status.json
index 6e35e1b1500..09a308eb8c6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2874,7 +2874,7 @@
         "description": "anv: fix null pointer access",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "595889018ad4fa3e2c593a13d640c9eee26336c7",
         "notes": null
diff --git a/src/intel/vulkan/i915/anv_device.c b/src/intel/vulkan/i915/anv_device.c
index ecbe7663f1c..d9cdbdcceea 100644
--- a/src/intel/vulkan/i915/anv_device.c
+++ b/src/intel/vulkan/i915/anv_device.c
@@ -317,6 +317,7 @@ anv_i915_device_setup_context(struct anv_device *device,
 
    /* Check if client specified queue priority. */
    const VkDeviceQueueGlobalPriorityCreateInfoKHR *queue_priority =
+      num_queues == 0 ? NULL :
       vk_find_struct_const(pCreateInfo->pQueueCreateInfos[0].pNext,
                            DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR);