diff --git a/.pick_status.json b/.pick_status.json
index 3c2b8aad5bd..3d2b0e1687d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2614,7 +2614,7 @@
         "description": "driconf: disable allow_rgb16_configs for SPECviewperf",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f2aaa9ce00ffe7310bddcd5e884f34afb741f460",
         "notes": null
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 69ba95c4b8e..59a2a55c56a 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -424,6 +424,8 @@ TODO: document the other workarounds.
             <!-- Creating 10-bit pbuffers fails in the X server and returns BadAlloc. -->
             <option name="allow_rgb10_configs" value="false" />
             <option name="allow_invalid_glx_destroy_window" value="true" />
+            <!-- 16-bit configs cause issues with viewset maya_06. -->
+            <option name="allow_rgb16_configs" value="false" />
         </application>
 
         <!-- Workaround for unsynchronized VBO updates on Dead Cells android