diff --git a/.pick_status.json b/.pick_status.json
index 0d4664798ca..3f903a45656 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1794,7 +1794,7 @@
         "description": "tu: Store gmem attachments after custom resolve in dyn RP",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "520e3f3a4732e66bbb2cdfe3b2a72a321ce9c04e",
         "notes": null
diff --git a/src/freedreno/vulkan/tu_pass.cc b/src/freedreno/vulkan/tu_pass.cc
index 074bf47a513..8f216215d4c 100644
--- a/src/freedreno/vulkan/tu_pass.cc
+++ b/src/freedreno/vulkan/tu_pass.cc
@@ -1696,6 +1696,14 @@ tu_setup_dynamic_render_pass(struct tu_cmd_buffer *cmd_buffer,
       resolve_subpass->fsr_attachment_texel_size =
          subpass->fsr_attachment_texel_size;
       resolve_subpass->fsr_attachment = subpass->fsr_attachment;
+
+      /* We don't do stores on vkCmdBeginCustomResolveEXT, so move them
+       * after custom resolve.
+       */
+      for (uint32_t i = 0; i < pass->user_attachment_count; i++) {
+         struct tu_render_pass_attachment *att = &pass->attachments[i];
+         att->last_subpass_idx = 1;
+      }
    }
 
    if (TU_DEBUG(FDM) && !tu_render_pass_disable_fdm(device, pass))