diff --git a/.pick_status.json b/.pick_status.json
index a80917337c7..ae28d66ad2a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -859,7 +859,7 @@
         "description": "radeonsi/gfx11: don't set VERTS_PER_SUBGRP to 0",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "25a66477d0268181121c0436f62b2100b72df068"
     },
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp
index bace555b996..ee42f33130a 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.cpp
+++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp
@@ -1320,7 +1320,7 @@ static void gfx10_emit_ge_cntl(struct si_context *sctx, unsigned num_patches)
                G_03096C_PRIM_GRP_SIZE_GFX11(si_get_vs_inline(sctx, HAS_TESS, HAS_GS)->current->ge_cntl);
 
             ge_cntl = S_03096C_PRIMS_PER_SUBGRP(num_patches) |
-                      S_03096C_VERTS_PER_SUBGRP(0) |
+                      S_03096C_VERTS_PER_SUBGRP(si_get_vs_inline(sctx, HAS_TESS, HAS_GS)->current->ngg.hw_max_esverts) |
                       S_03096C_BREAK_PRIMGRP_AT_EOI(key.u.tess_uses_prim_id) |
                       S_03096C_PRIM_GRP_SIZE_GFX11(prim_grp_size);
          } else {