diff --git a/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp b/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp
index 2cf1702f679..82beb4c6897 100644
--- a/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_bufmgr.cpp
@@ -218,7 +218,8 @@ d3d12_buffer_destroy(void *winsys, struct pb_buffer *pbuf)
 {
    struct d3d12_buffer *buf = d3d12_buffer(pbuf);
 
-   d3d12_bo_unmap(buf->bo, &buf->range);
+   if (buf->map)
+      d3d12_bo_unmap(buf->bo, &buf->range);
    d3d12_bo_unreference(buf->bo);
    FREE(buf);
 }