diff --git a/.pick_status.json b/.pick_status.json
index b1ec55a9c80..ff803335f1b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6374,7 +6374,7 @@
         "description": "st/mesh: handle mesh shader point size",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "51d6e4404aeb3a8e3c7eeb39584d590099a17402",
         "notes": null
diff --git a/src/mesa/state_tracker/st_util.h b/src/mesa/state_tracker/st_util.h
index f8381e80eb3..9958ea8eab4 100644
--- a/src/mesa/state_tracker/st_util.h
+++ b/src/mesa/state_tracker/st_util.h
@@ -104,6 +104,14 @@ st_point_size_per_vertex(struct gl_context *ctx)
                       VARYING_BIT_PSIZ);
       }
    }
+   const struct gl_program *meshProg = ctx->MeshProgram._Current;
+   if (meshProg) {
+      if (meshProg->info.outputs_written &
+          VARYING_BIT_PSIZ) {
+         /* generated program which emits point size */
+         return true;
+      }
+   }
    return false;
 }