1 files changed, 14 insertions, 6 deletions
diff --git a/dom/webgpu/ShaderModule.cpp b/dom/webgpu/ShaderModule.cpp
index bd123c8423..fce469a174 100644
--- a/dom/webgpu/ShaderModule.cpp
+++ b/dom/webgpu/ShaderModule.cpp
@@ -25,13 +25,21 @@ ShaderModule::ShaderModule(Device* const aParent, RawId aId,
 ShaderModule::~ShaderModule() { Cleanup(); }
 
 void ShaderModule::Cleanup() {
-  if (mValid && mParent) {
-    mValid = false;
-    auto bridge = mParent->GetBridge();
-    if (bridge && bridge->IsOpen()) {
-      bridge->SendShaderModuleDrop(mId);
-    }
+  if (!mValid) {
+    return;
   }
+  mValid = false;
+
+  auto bridge = mParent->GetBridge();
+  if (!bridge) {
+    return;
+  }
+
+  if (bridge->CanSend()) {
+    bridge->SendShaderModuleDrop(mId);
+  }
+
+  wgpu_client_free_shader_module_id(bridge->GetClient(), mId);
 }
 
 already_AddRefed<dom::Promise> ShaderModule::CompilationInfo(ErrorResult& aRv) {