diff --git a/.pick_status.json b/.pick_status.json
index ca2538eb80a..0008ada8a67 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5694,7 +5694,7 @@
         "description": "frontends/va: Flush after unmapping VAImageBufferType",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/va/buffer.c b/src/gallium/frontends/va/buffer.c
index 908b6bd21e2..be1c230219b 100644
--- a/src/gallium/frontends/va/buffer.c
+++ b/src/gallium/frontends/va/buffer.c
@@ -213,6 +213,9 @@ vlVaUnmapBuffer(VADriverContextP ctx, VABufferID buf_id)
 
       unmap_func(drv->pipe, buf->derived_surface.transfer);
       buf->derived_surface.transfer = NULL;
+
+      if (buf->type == VAImageBufferType)
+         drv->pipe->flush(drv->pipe, NULL, 0);
    }
    mtx_unlock(&drv->mutex);