diff --git a/.pick_status.json b/.pick_status.json
index 4ade7b12ac3..fb277551fd3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1394,7 +1394,7 @@
         "description": "egl: Remove check for GL or GLES",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 640a6a417c4..77204347e57 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -270,8 +270,7 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *disp,
           *     contexts."
           */
          if (!(disp->Extensions.KHR_create_context && api == EGL_OPENGL_API) &&
-             !(disp->Version >= 15 &&
-               (api == EGL_OPENGL_API || api == EGL_OPENGL_ES_API))) {
+             disp->Version < 15) {
             err = EGL_BAD_ATTRIBUTE;
             break;
          }