diff --git a/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp b/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp
index b710069a63..91505c1c6e 100644
--- a/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp
+++ b/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp
@@ -275,6 +275,27 @@ MaybeError PipelineLayout::Initialize() {
     return {};
 }
 
+void PipelineLayout::DestroyImpl() {
+    PipelineLayoutBase::DestroyImpl();
+
+    Device* device = ToBackend(GetDevice());
+    device->ReferenceUntilUnused(mRootSignature);
+
+    // The ID3D12CommandSignature object should not be referenced by GPU operations in-flight on
+    // Command Queue when it is being deleted. According to D3D12 debug layer, "it is not safe to
+    // final-release objects that may have GPU operations pending. This can result in application
+    // instability (921)".
+    if (mDispatchIndirectCommandSignatureWithNumWorkgroups.Get()) {
+        device->ReferenceUntilUnused(mDispatchIndirectCommandSignatureWithNumWorkgroups);
+    }
+    if (mDrawIndirectCommandSignatureWithInstanceVertexOffsets.Get()) {
+        device->ReferenceUntilUnused(mDrawIndirectCommandSignatureWithInstanceVertexOffsets);
+    }
+    if (mDrawIndexedIndirectCommandSignatureWithInstanceVertexOffsets.Get()) {
+        device->ReferenceUntilUnused(mDrawIndexedIndirectCommandSignatureWithInstanceVertexOffsets);
+    }
+}
+
 uint32_t PipelineLayout::GetCbvUavSrvRootParameterIndex(BindGroupIndex group) const {
     ASSERT(group < kMaxBindGroupsTyped);
     return mCbvUavSrvRootParameterInfo[group];
diff --git a/src/dawn/native/d3d12/PipelineLayoutD3D12.h b/src/dawn/native/d3d12/PipelineLayoutD3D12.h
index 69d9095b09..5e5360e64b 100644
--- a/src/dawn/native/d3d12/PipelineLayoutD3D12.h
+++ b/src/dawn/native/d3d12/PipelineLayoutD3D12.h
@@ -85,6 +85,8 @@ class PipelineLayout final : public PipelineLayoutBase {
     ~PipelineLayout() override = default;
     using PipelineLayoutBase::PipelineLayoutBase;
     MaybeError Initialize();
+    void DestroyImpl() override;
+
     ityp::array<BindGroupIndex, uint32_t, kMaxBindGroups> mCbvUavSrvRootParameterInfo;
     ityp::array<BindGroupIndex, uint32_t, kMaxBindGroups> mSamplerRootParameterInfo;
     ityp::array<BindGroupIndex,