diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index e20bc6d8f25..f1eb6502d52 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1487,8 +1487,9 @@ check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d
          break;
       case EXTRA_EXT_SHADER_IMAGE_GS:
          api_check = GL_TRUE;
-         if (ctx->Extensions.ARB_shader_image_load_store &&
-            _mesa_has_geometry_shaders(ctx))
+         if ((ctx->Extensions.ARB_shader_image_load_store ||
+              _mesa_is_gles31(ctx)) &&
+             _mesa_has_geometry_shaders(ctx))
             api_found = GL_TRUE;
          break;
       case EXTRA_EXT_ATOMICS_TESS: