diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 25321b328ae..b505f669c98 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -142,7 +142,7 @@ query_type_is_dummy(struct gl_context *ctx, unsigned type)
    case PIPE_QUERY_PIPELINE_STATISTICS:
       return !st->has_pipeline_stat;
    case PIPE_QUERY_PIPELINE_STATISTICS_SINGLE:
-      return !st->has_single_pipe_stat;
+      return !st->screen->caps.query_pipeline_statistics_single;
    default:
       break;
    }
@@ -202,7 +202,7 @@ begin_query(struct gl_context *ctx, struct gl_query_object *q)
    case GL_TASK_SHADER_INVOCATIONS_EXT:
    case GL_MESH_SHADER_INVOCATIONS_EXT:
    case GL_MESH_PRIMITIVES_GENERATED_EXT:
-      type = st->has_single_pipe_stat ? PIPE_QUERY_PIPELINE_STATISTICS_SINGLE
+      type = st->screen->caps.query_pipeline_statistics_single ? PIPE_QUERY_PIPELINE_STATISTICS_SINGLE
                                       : PIPE_QUERY_PIPELINE_STATISTICS;
       break;
    default:
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index e3e0763daab..95a30245670 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -583,8 +583,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
          PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_ALPHA_NOT_W);
    ctx->Const.GLSLHasHalfFloatPacking =
       screen->caps.shader_pack_half_float;
-   st->has_single_pipe_stat =
-      screen->caps.query_pipeline_statistics_single;
    st->has_pipeline_stat =
       screen->caps.query_pipeline_statistics;
    st->has_indep_blend_enable =
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 36f3f74cdd6..056d5401373 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -159,7 +159,6 @@ struct st_context
    bool force_compute_based_texture_transfer;
    bool force_specialized_compute_transfer;
    bool force_persample_in_shader;
-   bool has_single_pipe_stat;
    bool has_pipeline_stat;
    bool has_indep_blend_enable;
    bool has_indep_blend_func;