diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 289a3b7906a..7d361ce305e 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -5576,7 +5576,7 @@ struct gl_context
    struct st_context *st;
    struct pipe_context *pipe;
    struct st_config_options *st_opts;
-
+   struct cso_context *cso_context;
    /*@}*/
 
    /**
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 90902079441..6ef02b1aa8e 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -578,6 +578,7 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
    }
 
    st->cso_context = cso_create_context(pipe, cso_flags);
+   ctx->cso_context = st->cso_context;
 
    st_init_atoms(st);
    st_init_clear(st);