diff --git a/.pick_status.json b/.pick_status.json
index 6df2ac72438..0cedb5a24ad 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1564,7 +1564,7 @@
         "description": "nir: fix nir_is_io_compact for mesh shaders",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/compiler/nir/nir_unlower_io_to_vars.c b/src/compiler/nir/nir_unlower_io_to_vars.c
index ee2658e3a60..5eaf26d4b22 100644
--- a/src/compiler/nir/nir_unlower_io_to_vars.c
+++ b/src/compiler/nir/nir_unlower_io_to_vars.c
@@ -77,8 +77,8 @@ is_compact(nir_shader *nir, bool is_output, unsigned location)
            location == VARYING_SLOT_CLIP_DIST1 ||
            location == VARYING_SLOT_CULL_DIST0 ||
            location == VARYING_SLOT_CULL_DIST1 ||
-           location == VARYING_SLOT_TESS_LEVEL_OUTER ||
-           location == VARYING_SLOT_TESS_LEVEL_INNER);
+           (nir->info.stage != MESA_SHADER_MESH && location == VARYING_SLOT_TESS_LEVEL_OUTER) ||
+           (nir->info.stage != MESA_SHADER_MESH && location == VARYING_SLOT_TESS_LEVEL_INNER));
 }
 
 /* Get information about the intrinsic. */