diff --git a/.pick_status.json b/.pick_status.json
index 1b7fa266b6f..f70b604e95f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1274,7 +1274,7 @@
         "description": "r300: disable clip-discard watermark for triangles",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "0d4aa5f55ff80df5b357f10bd56864c97ef1f4ba",
         "notes": null
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index 901b88b66a9..36c3ea5ee75 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -147,7 +147,8 @@ void r300_set_clip_discard_distance(struct r300_context *r300, float distance)
         r300->min_clip_discard_distance_watermark = MIN2(distance, 6.0f);
     }
 
-    float new_distance = MAX2(distance, r300->min_clip_discard_distance_watermark);
+    float new_distance = distance > 0.0f ?
+        MAX2(distance, r300->min_clip_discard_distance_watermark) : 0.0f;
 
     if (r300->current_clip_discard_distance != new_distance) {
         r300->current_clip_discard_distance = new_distance;