diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp
index fec45975..c2cd35f0 100644
--- a/src/d3d11/d3d11_context.cpp
+++ b/src/d3d11/d3d11_context.cpp
@@ -66,7 +66,11 @@ namespace dxvk {
     COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
     COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceContext);
     
+    if (riid == __uuidof(ID3DUserDefinedAnnotation))
+      return E_NOINTERFACE;
+  
     Logger::warn("D3D11DeviceContext::QueryInterface: Unknown interface query");
+    Logger::warn(str::format(riid));
     return E_NOINTERFACE;
   }
   
diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
index a8ddab96..a1e51688 100644
--- a/src/d3d11/d3d11_device.cpp
+++ b/src/d3d11/d3d11_device.cpp
@@ -64,6 +64,9 @@ namespace dxvk {
     
     if (riid == __uuidof(IDXGIPresentDevicePrivate))
       return m_presentDevice->QueryInterface(riid, ppvObject);
+
+    if (riid == __uuidof(ID3D11Debug))
+      return E_NOINTERFACE;      
     
     Logger::warn("D3D11Device::QueryInterface: Unknown interface query");
     Logger::warn(str::format(riid));