diff --git a/.pick_status.json b/.pick_status.json
index cfe89bda3b8..4b60abe82ba 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -220,7 +220,7 @@
         "description": "driconf: set vk_x11_strict_image_count for Metro: Exodus",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 7e48cff109d..70ab92399b1 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -645,6 +645,11 @@ TODO: document the other workarounds.
         <application name="DOOMEternal" executable="DOOMEternalx64vk.exe">
             <option name="vk_x11_ensure_min_image_count" value="true" />
         </application>
+
+        <!-- Metro:Exodus crashes at startup on xwayland without this workaround-->
+        <application name="Metro: Exodus" application_name_match="metroexodus">
+            <option name="vk_x11_strict_image_count" value="true" />
+        </application>
     </device>
     <!-- vmwgfx doesn't like full buffer swaps and can't sync to vertical retraces.-->
     <device driver="vmwgfx">