diff --git a/gfx/common/d3d12_common.c b/gfx/common/d3d12_common.c
index 8c92d55131..14870d9790 100644
--- a/gfx/common/d3d12_common.c
+++ b/gfx/common/d3d12_common.c
@@ -148,8 +148,8 @@ bool d3d12_init_base(d3d12_video_t* d3d12)
    if (SUCCEEDED(D3D12GetDebugInterface_(&d3d12->debugController)))
       d3d12->debugController->lpVtbl->EnableDebugLayer(&d3d12->debugController);
 #else
-   D3D12GetDebugInterface_(&d3d12->debugController);
-   D3D12EnableDebugLayer(d3d12->debugController);
+   if (SUCCEEDED(D3D12GetDebugInterface_(&d3d12->debugController)))
+      d3d12->debugController->lpVtbl->EnableDebugLayer(d3d12->debugController);
 #endif
 #endif