diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index ead8d27a919..0a58fd931f6 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1134,7 +1134,7 @@ radv_query_shader(struct radv_cmd_buffer *cmd_buffer, VkPipeline *pipeline, stru
                                                                          .range = VK_WHOLE_SIZE}}});
 
    /* Encode the number of elements for easy access by the shader. */
-   pipeline_stats_mask &= 0x7ff;
+   pipeline_stats_mask &= (1 << radv_get_pipelinestat_query_size(device)) - 1;
    pipeline_stats_mask |= util_bitcount(pipeline_stats_mask) << 16;
 
    avail_offset -= src_offset;