diff --git a/.pick_status.json b/.pick_status.json
index 7fc2072923e..d1f17e3ac26 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3145,7 +3145,7 @@
         "description": "radv: Fix uninitialized variable in renderpass.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "66131ceb8bc9f3a3e17a73d90ef520694e3b50b6"
     },
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 66f80e459f9..ab1e1a6d2c8 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -3300,6 +3300,7 @@ radv_cmd_state_setup_attachments(struct radv_cmd_buffer *cmd_buffer,
 		}
 
 		state->attachments[i].current_layout = att->initial_layout;
+		state->attachments[i].current_in_render_loop = false;
 		state->attachments[i].current_stencil_layout = att->stencil_initial_layout;
 		state->attachments[i].sample_location.count = 0;