diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp
index ca04616e..492da900 100644
--- a/src/d3d11/d3d11_context_imm.cpp
+++ b/src/d3d11/d3d11_context_imm.cpp
@@ -347,6 +347,9 @@ namespace dxvk {
     SynchronizeCsThread();
     
     if (Resource->isInUse()) {
+      if (MapFlags & D3D11_MAP_FLAG_DO_NOT_WAIT)
+        return false;
+      
       // TODO implement properly in DxvkDevice
       while (Resource->isInUse())
         std::this_thread::yield();