diff --git a/.pick_status.json b/.pick_status.json
index 9b66c37905d..1e8f6cbe42d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -674,7 +674,7 @@
         "description": "vulkan/wsi/wayland: fix suboptimal flag being ignored with explicit sync",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "5f7a5a27ef1b630bd1aea0cc0b1256fadee9de8e",
         "notes": null
diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index 1658613d2f1..fc208057298 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -1907,8 +1907,11 @@ wsi_wl_swapchain_acquire_next_image_explicit(struct wsi_swapchain *wsi_chain,
 #endif
    STACK_ARRAY_FINISH(images);
 
-   if (result == VK_SUCCESS)
+   if (result == VK_SUCCESS) {
       chain->images[*image_index].flow_id = id;
+      if (chain->suboptimal)
+         result = VK_SUBOPTIMAL_KHR;
+   }
 
    return result;
 }