diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index cf7082edc63..3607f13ed28 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -3413,7 +3413,7 @@ void anv_GetDeviceQueue2(
    }
    assert(queue != NULL);
 
-   if (queue && queue->flags == pQueueInfo->flags)
+   if (queue && queue->vk.flags == pQueueInfo->flags)
       *pQueue = anv_queue_to_handle(queue);
    else
       *pQueue = NULL;
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index a60427e22db..3fd5ac72182 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -1081,7 +1081,6 @@ struct anv_queue {
 
    struct anv_device *                       device;
 
-   VkDeviceQueueCreateFlags                  flags;
    const struct anv_queue_family *           family;
 
    uint32_t                                  exec_flags;
diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c
index aa1a511fc0d..b9c7595427e 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -485,10 +485,9 @@ anv_queue_init(struct anv_device *device, struct anv_queue *queue,
       return result;
 
    queue->device = device;
-   queue->flags = pCreateInfo->flags;
 
-   assert(pCreateInfo->queueFamilyIndex < pdevice->queue.family_count);
-   queue->family = &pdevice->queue.families[pCreateInfo->queueFamilyIndex];
+   assert(queue->vk.queue_family_index < pdevice->queue.family_count);
+   queue->family = &pdevice->queue.families[queue->vk.queue_family_index];
 
    queue->exec_flags = exec_flags;
    queue->lost = false;