diff --git a/.pick_status.json b/.pick_status.json
index 1dbaef70e33..0573caa8830 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3244,7 +3244,7 @@
         "description": "radeonsi: use radeonsi_clamp_div_by_zero for SPECviewperf13, Road Redemption",
         "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 5cd65ccf18d..b3358104e89 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -667,6 +667,10 @@ TODO: document the other workarounds.
         </application>
         <application name="SPECviewperf13" executable="viewperf">
             <option name="radeonsi_sync_compile" value="true" />
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
+        </application>
+        <application name="Road Redemption" executable="RoadRedemption.x86_64">
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
         </application>
     </device>
     <device driver="virtio_gpu">