diff --git a/src/intel/vulkan/genX_cmd_draw.c b/src/intel/vulkan/genX_cmd_draw.c
index a6d24c51a4f..9156384f9cd 100644
--- a/src/intel/vulkan/genX_cmd_draw.c
+++ b/src/intel/vulkan/genX_cmd_draw.c
@@ -665,7 +665,7 @@ cmd_buffer_maybe_flush_rt_writes(struct anv_cmd_buffer *cmd_buffer,
    /* Build a map of fragment color output to attachment */
    uint8_t rt_to_att[MAX_RTS];
    memset(rt_to_att, ANV_COLOR_OUTPUT_DISABLED, MAX_RTS);
-   for (uint32_t i = 0; i < MAX_RTS; i++) {
+   for (uint32_t i = 0; i < gfx->color_att_count; i++) {
       if (dyn->cal.color_map[i] != MESA_VK_ATTACHMENT_UNUSED)
          rt_to_att[dyn->cal.color_map[i]] = i;
    }