diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c
index c207c532926..8a8783fc71c 100644
--- a/src/broadcom/vulkan/v3dv_cmd_buffer.c
+++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c
@@ -1843,8 +1843,9 @@ v3dv_CmdEndRenderPass(VkCommandBuffer commandBuffer)
    }
 
    /* We are no longer inside a render pass */
-   state->pass = NULL;
    state->framebuffer = NULL;
+   state->pass = NULL;
+   state->subpass_idx = -1;
 }
 
 VkResult