diff --git a/.pick_status.json b/.pick_status.json
index 0e159e33c3b..4b90690f636 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3298,7 +3298,7 @@
         "description": "teximage: return correct desktop GL error for compressedteximage",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 24275c7d947..95d2a301ccd 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2099,7 +2099,7 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
    /* No compressed formats support borders at this time */
    if (border != 0) {
       reason = "border != 0";
-      error = GL_INVALID_VALUE;
+      error = _mesa_is_desktop_gl(ctx) ? GL_INVALID_OPERATION : GL_INVALID_VALUE;
       goto error;
    }