diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
index e8d47810fab..75cdaaff78a 100644
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
@@ -625,6 +625,9 @@ d3d12_flush_frontbuffer(struct pipe_screen * pscreen,
    if (!winsys)
      return;
 
+   if (pctx)
+      d3d12_flush_cmdlist_and_wait(d3d12_context(pctx));
+
    assert(res->dt);
    void *map = winsys->displaytarget_map(winsys, res->dt, 0);