diff --git a/.pick_status.json b/.pick_status.json
index d977ea6e7f5..5c0f2455350 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -37858,7 +37858,7 @@
         "description": "osmesa: Replace default case FALLTHROUGH annotation by following return",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/osmesa/osmesa.c b/src/gallium/frontends/osmesa/osmesa.c
index c1b69e339da..1682a30c3d7 100644
--- a/src/gallium/frontends/osmesa/osmesa.c
+++ b/src/gallium/frontends/osmesa/osmesa.c
@@ -313,9 +313,8 @@ osmesa_choose_format(GLenum format, GLenum type)
          return PIPE_FORMAT_NONE;
       return PIPE_FORMAT_B5G6R5_UNORM;
    default:
-      FALLTHROUGH;
+      return PIPE_FORMAT_NONE;
    }
-   return PIPE_FORMAT_NONE;
 }