diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
index 938b1eef8..5a24bde05 100644
--- a/src/d3d9/d3d9_device.cpp
+++ b/src/d3d9/d3d9_device.cpp
@@ -4797,7 +4797,7 @@ namespace dxvk {
       texInfo->ClearNeedsUpload();
     }
 
-    m_activeTexturesToUpload = 0;
+    m_activeTexturesToUpload &= ~mask;
   }
 
 
@@ -5458,6 +5458,7 @@ namespace dxvk {
 
     uint32_t texturesToUpload = m_activeTexturesToUpload;
     texturesToUpload &= m_psShaderMasks.samplerMask | m_vsShaderMasks.samplerMask;
+
     if (unlikely(texturesToUpload != 0))
       UploadManagedTextures(texturesToUpload);