diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index 1f7aec4f85..e396ff16a4 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -894,7 +894,7 @@ static uint32_t gfx_ctx_x_get_flags(void *data)
 {
    uint32_t flags = 0;
    gfx_ctx_x_data_t *x = (gfx_ctx_x_data_t*)data;
-   if (x->core_hw_context_enable)
+   if (x->core_hw_context_enable || x->g_core_es)
    {
       BIT32_SET(flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT);
    }