diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.h b/renderdoc/driver/dxgi/dxgi_wrapped.h
index 27a606648..86d5100d6 100644
--- a/renderdoc/driver/dxgi/dxgi_wrapped.h
+++ b/renderdoc/driver/dxgi/dxgi_wrapped.h
@@ -1553,13 +1553,16 @@ public:
       IDXGIAdapter1 *adapter = (IDXGIAdapter1 *)*ppvAdapter;
       *ppvAdapter = (IDXGIAdapter1 *)(new WrappedIDXGIAdapter4(adapter));
     }
-    else
+    else if(riid == __uuidof(IDXGIAdapter))
     {
-      RDCASSERT(riid == __uuidof(IDXGIAdapter), riid);
-
       IDXGIAdapter *adapter = (IDXGIAdapter *)*ppvAdapter;
       *ppvAdapter = (IDXGIAdapter *)(new WrappedIDXGIAdapter4(adapter));
     }
+    else
+    {
+      RDCWARN("Wrapping unknown adapter GUID %s", ToStr(riid).c_str());
+      RefCountDXGIObject::HandleWrap(riid, ppvAdapter);
+    }
   }
 
   virtual HRESULT STDMETHODCALLTYPE EnumAdapterByLuid(