diff --git a/.pick_status.json b/.pick_status.json
index ae081039d20..b64a2f7f03b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6169,7 +6169,7 @@
         "description": "lavapipe: fix one more descriptor set reference issue",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "20902d1ed685e97e135f4a16531793ddb7b4db69"
     },
diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c
index 91426707167..ededb4be13f 100644
--- a/src/gallium/frontends/lavapipe/lvp_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c
@@ -716,7 +716,8 @@ merge_layouts(struct vk_device *device, struct lvp_pipeline *dst, struct lvp_pip
    for (unsigned i = 0; i < src->vk.set_count; i++) {
       if (!dst->layout->vk.set_layouts[i]) {
          dst->layout->vk.set_layouts[i] = src->vk.set_layouts[i];
-         vk_descriptor_set_layout_ref(src->vk.set_layouts[i]);
+         if (dst->layout->vk.set_layouts[i])
+            vk_descriptor_set_layout_ref(src->vk.set_layouts[i]);
       }
    }
    dst->layout->vk.set_count = MAX2(dst->layout->vk.set_count,