diff --git a/.pick_status.json b/.pick_status.json
index d7e6673fb3f..652f042db8a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -40,7 +40,7 @@
         "description": "radv: fix computation of the number of user SGPRS for NGG GS state",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index 75f70d6c475..d480928b3dc 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -193,6 +193,9 @@ allocate_user_sgprs(struct radv_shader_args *args, gl_shader_stage stage, bool h
       break;
    case MESA_SHADER_GEOMETRY:
       if (has_previous_stage) {
+         if (args->options->key.vs_common_out.as_ngg)
+            user_sgpr_count++; /* NGG GS state */
+
          if (previous_stage == MESA_SHADER_VERTEX) {
             user_sgpr_count += count_vs_user_sgprs(args);
          }