diff --git a/.pick_status.json b/.pick_status.json
index 9e738ce0a81..d7e6673fb3f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -85,7 +85,7 @@
         "description": "driconf: add workaround for Golf With Friends",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index ec86d60079f..2b6511f0ffb 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -312,6 +312,11 @@ TODO: document the other workarounds.
             <option name="allow_glsl_extension_directive_midshader" value="true" />
         </application>
 
+        <application name="Golf With Your Friends" executable="Golf With Your Friends.x86_64">
+            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/4547 -->
+            <option name="glsl_correct_derivatives_after_discard" value="true" />
+        </application>
+
         <!-- The GL thread allowlist is below, workarounds are above.
              Keep it that way. -->