diff --git a/.pick_status.json b/.pick_status.json
index 17580d305c1..40862e1d04a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4564,7 +4564,7 @@
         "description": "mesa/st: do not advertise CL subgroup features on the GL side",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2a5227981e3634313a9358aa8a9632d924675572",
         "notes": null
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index a882caa5e54..1dca83a6a8b 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -639,7 +639,8 @@ void st_init_limits(struct pipe_screen *screen,
    c->ShaderSubgroupSupportedStages =
       mesa_to_gl_stages(screen->caps.shader_subgroup_supported_stages);
    c->ShaderSubgroupSupportedFeatures =
-      screen->caps.shader_subgroup_supported_features;
+      screen->caps.shader_subgroup_supported_features &
+         BITFIELD_MASK(PIPE_SHADER_SUBGROUP_NUM_FEATURES);
    c->ShaderSubgroupQuadAllStages =
       screen->caps.shader_subgroup_quad_all_stages;
 }