diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp
index aab7dd52f84..a362f6c3101 100644
--- a/src/d3d11/d3d11_context.cpp
+++ b/src/d3d11/d3d11_context.cpp
@@ -1655,7 +1655,7 @@ namespace dxvk {
     // submit the current command buffer in order to keep the GPU busy.
     // This also helps keep the command buffers at a reasonable size.
     if (m_drawCount >= 500)
-      this->Flush();
+      Flush();
     
     for (UINT i = 0; i < m_state.om.renderTargetViews.size(); i++) {
       D3D11RenderTargetView* view = nullptr;
diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp
index f98802368ba..d6e068bdee0 100644
--- a/src/d3d11/d3d11_context_imm.cpp
+++ b/src/d3d11/d3d11_context_imm.cpp
@@ -121,6 +121,7 @@ namespace dxvk {
             return DXGI_ERROR_WAS_STILL_DRAWING;
           
           Flush();
+          SynchronizeCsThread();
           SynchronizeDevice();
         }
       }