diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp
index 9417462b..d020ef69 100644
--- a/src/renderer_d3d12.cpp
+++ b/src/renderer_d3d12.cpp
@@ -1516,10 +1516,7 @@ data.NumQualityLevels = 0;
 					const bool bufferOnly = 0 != (texture.m_flags&BGFX_TEXTURE_RT_BUFFER_ONLY);
 					if (!bufferOnly)
 					{
-						texture.setState(m_commandList, D3D12_RESOURCE_STATES(0)
-							| D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE
-//							| D3D12_RESOURCE_STATE_DEPTH_READ
-							);
+						texture.setState(m_commandList, D3D12_RESOURCE_STATE_DEPTH_READ);
 					}
 				}
 			}
diff --git a/src/renderer_d3d12.h b/src/renderer_d3d12.h
index 2700076e..cb8edada 100644
--- a/src/renderer_d3d12.h
+++ b/src/renderer_d3d12.h
@@ -341,7 +341,7 @@ namespace bgfx { namespace d3d12
 
 		void shutdown()
 		{
-			finish();
+			finish(UINT64_MAX, true);
 
 			DX_RELEASE(m_fence, 0);