diff --git a/.pick_status.json b/.pick_status.json
index d2bfe7c2187..d748ae69f2b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -714,7 +714,7 @@
         "description": "zink: work around drivers with broken mesh shader properties",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 96ab56a2140..db27521600d 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1206,8 +1206,8 @@ zink_init_screen_caps(struct zink_screen *screen)
    caps->mesh.max_mesh_output_vertices = screen->info.mesh_props.maxMeshOutputVertices;
    caps->mesh.max_mesh_output_primitives = screen->info.mesh_props.maxMeshOutputPrimitives;
    caps->mesh.max_mesh_output_components = screen->info.mesh_props.maxMeshOutputComponents;
-   caps->mesh.max_mesh_output_layers = screen->info.mesh_props.maxMeshOutputLayers;
-   caps->mesh.max_mesh_multiview_view_count = screen->info.mesh_props.maxMeshMultiviewViewCount;
+   caps->mesh.max_mesh_output_layers = MAX2(screen->info.mesh_props.maxMeshOutputLayers, 1);
+   caps->mesh.max_mesh_multiview_view_count = MAX2(screen->info.mesh_props.maxMeshMultiviewViewCount, 1);
    caps->mesh.mesh_output_per_vertex_granularity = screen->info.mesh_props.meshOutputPerVertexGranularity;
    caps->mesh.mesh_output_per_primitive_granularity = screen->info.mesh_props.meshOutputPerPrimitiveGranularity;