diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 6d049c43941..5cc066e7e65 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -136,10 +136,6 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy
             dest_mask |= RADV_DYNAMIC_COLOR_WRITE_MASK;
          }
       }
-
-      if (cmd_buffer->device->physical_device->rad_info.rbplus_allowed &&
-          (dest_mask & RADV_DYNAMIC_COLOR_WRITE_MASK))
-         cmd_buffer->state.dirty |= RADV_CMD_DIRTY_RBPLUS;
    }
 
    if (copy_mask & RADV_DYNAMIC_COLOR_BLEND_ENABLE) {
@@ -251,6 +247,11 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy
                     RADV_DYNAMIC_PRIMITIVE_TOPOLOGY)) {
       cmd_buffer->state.dirty |= RADV_CMD_DIRTY_GUARDBAND;
    }
+
+   if (cmd_buffer->device->physical_device->rad_info.rbplus_allowed &&
+       (dest_mask & RADV_DYNAMIC_COLOR_WRITE_MASK)) {
+      cmd_buffer->state.dirty |= RADV_CMD_DIRTY_RBPLUS;
+   }
 }
 
 bool