diff --git a/src/amd/vulkan/meta/radv_meta_clear.c b/src/amd/vulkan/meta/radv_meta_clear.c
index 96f9280ec5e..bbac9addbe3 100644
--- a/src/amd/vulkan/meta/radv_meta_clear.c
+++ b/src/amd/vulkan/meta/radv_meta_clear.c
@@ -1011,10 +1011,6 @@ radv_device_init_meta_clear_state(struct radv_device *device, bool on_demand)
    if (res != VK_SUCCESS)
       return res;
 
-   res = create_clear_htile_mask_pipeline(device);
-   if (res != VK_SUCCESS)
-      return res;
-
    res = init_meta_clear_dcc_comp_to_single_state(device);
    if (res != VK_SUCCESS)
       return res;
@@ -1022,6 +1018,10 @@ radv_device_init_meta_clear_state(struct radv_device *device, bool on_demand)
    if (on_demand)
       return VK_SUCCESS;
 
+   res = create_clear_htile_mask_pipeline(device);
+   if (res != VK_SUCCESS)
+      return res;
+
    for (uint32_t i = 0; i < ARRAY_SIZE(state->color_clear); ++i) {
       uint32_t samples = 1 << i;