diff --git a/.pick_status.json b/.pick_status.json
index eeeba20eca4..f25adf2f99b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -11425,7 +11425,7 @@
         "description": "vulkan/wsi: Take max extent into consideration for modifier selection.",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/vulkan/wsi/wsi_common_drm.c b/src/vulkan/wsi/wsi_common_drm.c
index a767cb4d549..628715079f7 100644
--- a/src/vulkan/wsi/wsi_common_drm.c
+++ b/src/vulkan/wsi/wsi_common_drm.c
@@ -400,7 +400,9 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
          result = wsi->GetPhysicalDeviceImageFormatProperties2(wsi->pdevice,
                                                                &format_info,
                                                                &format_props);
-         if (result == VK_SUCCESS)
+         if (result == VK_SUCCESS &&
+             pCreateInfo->imageExtent.width <= format_props.imageFormatProperties.maxExtent.width &&
+             pCreateInfo->imageExtent.height <= format_props.imageFormatProperties.maxExtent.height)
             info->modifier_props[info->modifier_prop_count++] = info->modifier_props[i];
       }