diff --git a/.pick_status.json b/.pick_status.json
index 043c4dd0297..7171a3f992b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
         "description": "util: use force_gl_map_buffer_synchronized workaround with RAGE",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 917904a09a9..92f9df726ea 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -159,10 +159,12 @@ TODO: document the other workarounds.
 
         <application name="RAGE (64-bit)" executable="Rage64.exe">
             <option name="allow_glsl_builtin_variable_redeclaration" value="true" />
+            <option name="force_gl_map_buffer_synchronized" value="true" />
         </application>
 
         <application name="RAGE (32-bit)" executable="Rage.exe">
             <option name="allow_glsl_builtin_variable_redeclaration" value="true" />
+            <option name="force_gl_map_buffer_synchronized" value="true" />
         </application>
 
         <application name="Second Life" executable="do-not-directly-run-secondlife-bin">