diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index aba401acabf..a570d96c5f7 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -716,7 +716,7 @@ zink_set_vertex_buffers(struct pipe_context *pctx,
 {
    struct zink_context *ctx = zink_context(pctx);
 
-   util_set_vertex_buffers_mask(ctx->vertex_buffers, &ctx->vertex_buffers_enabled_mask,
+   util_set_vertex_buffers_mask(ctx->vertex_buffers, &ctx->gfx_pipeline_state.vertex_buffers_enabled_mask,
                                 buffers, start_slot, num_buffers,
                                 unbind_num_trailing_slots, take_ownership);
 }
diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index a1656c10590..47c29614c54 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -178,7 +178,6 @@ struct zink_context {
    struct zink_framebuffer_clear fb_clears[PIPE_MAX_COLOR_BUFS + 1];
 
    struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS];
-   uint32_t vertex_buffers_enabled_mask;
 
    void *sampler_states[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS];
    VkSampler samplers[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS];
diff --git a/src/gallium/drivers/zink/zink_pipeline.h b/src/gallium/drivers/zink/zink_pipeline.h
index fdde37d8392..0e6daea2514 100644
--- a/src/gallium/drivers/zink/zink_pipeline.h
+++ b/src/gallium/drivers/zink/zink_pipeline.h
@@ -66,6 +66,7 @@ struct zink_gfx_pipeline_state {
     * Members after this point are not included in pipeline state hash key */
    uint32_t hash;
    bool dirty;
+   uint32_t vertex_buffers_enabled_mask;
 };
 
 struct zink_compute_pipeline_state {