1 files changed, 14 insertions, 4 deletions
diff --git a/dom/webgpu/BindGroupLayout.cpp b/dom/webgpu/BindGroupLayout.cpp
index cb5035b308..b447b63496 100644
--- a/dom/webgpu/BindGroupLayout.cpp
+++ b/dom/webgpu/BindGroupLayout.cpp
@@ -22,12 +22,22 @@ BindGroupLayout::BindGroupLayout(Device* const aParent, RawId aId, bool aOwning)
 BindGroupLayout::~BindGroupLayout() { Cleanup(); }
 
 void BindGroupLayout::Cleanup() {
-  if (mValid && mParent) {
-    mValid = false;
-    auto bridge = mParent->GetBridge();
-    if (mOwning && bridge && bridge->IsOpen()) {
+  if (!mValid) {
+    return;
+  }
+  mValid = false;
+
+  auto bridge = mParent->GetBridge();
+  if (!bridge) {
+    return;
+  }
+
+  if (mOwning) {
+    if (bridge->CanSend()) {
       bridge->SendBindGroupLayoutDrop(mId);
     }
+
+    wgpu_client_free_bind_group_layout_id(bridge->GetClient(), mId);
   }
 }