diff --git a/.pick_status.json b/.pick_status.json
index 9e2362eb90c..61bedb9c6c4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1759,7 +1759,7 @@
         "description": "vk/runtime: Fix narrowing of timeline signal and wait value to u32.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9bffd81f1cb7c4a653d18b4b43296f89caed4db7"
     },
diff --git a/src/vulkan/runtime/vk_queue.c b/src/vulkan/runtime/vk_queue.c
index edc57cb234d..0f4fde23c5e 100644
--- a/src/vulkan/runtime/vk_queue.c
+++ b/src/vulkan/runtime/vk_queue.c
@@ -679,7 +679,7 @@ vk_queue_submit(struct vk_queue *queue,
          sync = &semaphore->permanent;
       }
 
-      uint32_t wait_value = semaphore->type == VK_SEMAPHORE_TYPE_TIMELINE ?
+      uint64_t wait_value = semaphore->type == VK_SEMAPHORE_TYPE_TIMELINE ?
                             info->waits[i].value : 0;
 
       submit->waits[i] = (struct vk_sync_wait) {
@@ -746,7 +746,7 @@ vk_queue_submit(struct vk_queue *queue,
                      info->signals[i].semaphore);
 
       struct vk_sync *sync = vk_semaphore_get_active_sync(semaphore);
-      uint32_t signal_value = info->signals[i].value;
+      uint64_t signal_value = info->signals[i].value;
       if (semaphore->type == VK_SEMAPHORE_TYPE_TIMELINE) {
          if (signal_value == 0) {
             result = vk_queue_set_lost(queue,