diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c
index f0b33923089..3f44c96cacb 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_state.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_state.c
@@ -798,8 +798,11 @@ etna_record_flush_resources(struct etna_context *ctx)
 {
    struct pipe_framebuffer_state *fb = &ctx->framebuffer_s;
 
-   if (fb->nr_cbufs > 0) {
-      struct etna_surface *surf = etna_surface(fb->cbufs[0]);
+   for (unsigned i = 0; i < fb->nr_cbufs; i++) {
+      if (!fb->cbufs[i])
+         continue;
+
+      struct etna_surface *surf = etna_surface(fb->cbufs[i]);
       struct etna_resource *rsc = etna_resource(surf->prsc);
 
       if (rsc->shared && !rsc->explicit_flush)