diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index bfcc3ceefcb..159dff16af6 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -497,7 +497,7 @@ st_astc_format_fallback(const struct st_context *st, mesa_format format)
    if (!_mesa_is_format_astc_2d(format))
       return false;
 
-   if (st->astc_void_extents_need_denorm_flush && !util_format_is_srgb(format))
+   if (st->screen->caps.astc_void_extents_need_denorm_flush && !util_format_is_srgb(format))
       return true;
 
    if (format == MESA_FORMAT_RGBA_ASTC_5x5 ||
@@ -758,7 +758,7 @@ st_UnmapTextureImage(struct gl_context *ctx,
          assert(z == transfer->box.z);
 
          if (_mesa_is_format_astc_2d(texImage->pt->format)) {
-            assert(st->astc_void_extents_need_denorm_flush);
+            assert(st->screen->caps.astc_void_extents_need_denorm_flush);
             upload_astc_slice_with_flushed_void_extents(map, transfer->stride,
                                                         itransfer->temp_data,
                                                         itransfer->temp_stride,
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 49b83de6372..2a9b1a2a262 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -555,8 +555,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
    st->has_astc_5x5_ldr =
       screen->is_format_supported(screen, PIPE_FORMAT_ASTC_5x5_SRGB,
                                   PIPE_TEXTURE_2D, 0, 0, PIPE_BIND_SAMPLER_VIEW);
-   st->astc_void_extents_need_denorm_flush =
-      screen->caps.astc_void_extents_need_denorm_flush;
 
    st->has_s3tc = screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
                                               PIPE_TEXTURE_2D, 0, 0,
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 14b70cf28ac..3249f6025c6 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -151,7 +151,6 @@ struct st_context
    bool transcode_astc;
    bool has_astc_2d_ldr;
    bool has_astc_5x5_ldr;
-   bool astc_void_extents_need_denorm_flush;
    bool has_s3tc;
    bool has_rgtc;
    bool has_latc;
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index c9d0f22e85a..7e50e49e9bf 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -114,7 +114,7 @@ st_mesa_format_to_pipe_format(const struct st_context *st,
                           mesaFormat == PIPE_FORMAT_ASTC_5x5_SRGB;
 
       /* If we're only emulating ASTC void extents, use the original format */
-      if (st->astc_void_extents_need_denorm_flush &&
+      if (st->screen->caps.astc_void_extents_need_denorm_flush &&
           (is_5x5 ? st->has_astc_5x5_ldr : st->has_astc_2d_ldr))
          return mesaFormat;