diff --git a/.pick_status.json b/.pick_status.json
index 85a4f15f8c6..a7e8bb8b106 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -21314,7 +21314,7 @@
         "description": "glsl: only explicitly check GS components in PSIZ injection with output variables",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index d9787d79e89..c870d1b1edd 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -151,7 +151,7 @@ gl_nir_can_add_pointsize_to_program(const struct gl_constants *consts,
    }
 
    /* Ensure that there is enough attribute space to emit at least one primitive */
-   if (nir->info.stage == MESA_SHADER_GEOMETRY) {
+   if (num_components && nir->info.stage == MESA_SHADER_GEOMETRY) {
       if (num_components + needed_components > consts->Program[nir->info.stage].MaxOutputComponents)
          return false;
       num_components *= nir->info.gs.vertices_out;