diff --git a/.pick_status.json b/.pick_status.json
index a78ad9bc8f3..1e037f91c1e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -14,7 +14,7 @@
         "description": "nir/lower_robust_access: fix robustness with atomic swap",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f0fb8d05e30c51e070155c957f3b71cf31c4b784",
         "notes": null
diff --git a/src/compiler/nir/nir_lower_robust_access.c b/src/compiler/nir/nir_lower_robust_access.c
index cdf103eed8f..e5a3ba24885 100644
--- a/src/compiler/nir/nir_lower_robust_access.c
+++ b/src/compiler/nir/nir_lower_robust_access.c
@@ -211,6 +211,7 @@ lower(nir_builder *b, nir_instr *instr, void *_opts)
       }
       return false;
    case nir_intrinsic_ssbo_atomic:
+   case nir_intrinsic_ssbo_atomic_swap:
       if (opts->lower_ssbo) {
          lower_buffer_atomic(b, intr);
          return true;