diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c
index 39ac5c4a7ec..4a14e58c389 100644
--- a/src/gallium/drivers/zink/zink_clear.c
+++ b/src/gallium/drivers/zink/zink_clear.c
@@ -408,8 +408,10 @@ out:
       }
       to_clear = 0;
    }
-   for (int i = 0; i < ARRAY_SIZE(ctx->fb_clears); i++)
-       zink_fb_clear_reset(ctx, i);
+   if (ctx->clears_enabled & PIPE_CLEAR_DEPTHSTENCIL)
+      zink_fb_clear_reset(ctx, PIPE_MAX_COLOR_BUFS);
+   u_foreach_bit(i, ctx->clears_enabled >> 2)
+      zink_fb_clear_reset(ctx, i);
 }
 
 static struct pipe_surface *