diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index 8d54c3f7da4..9cb99b7d154 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -161,7 +161,12 @@ impl WorkerGlobalScope {
         }
     }
 
+    /// Clear various items when the worker event-loop shuts-down.
     pub fn clear_js_runtime(&self) {
+        self.upcast::<GlobalScope>()
+            .remove_web_messaging_and_dedicated_workers_infra();
+
+        // Drop the runtime.
         let runtime = self.runtime.borrow_mut().take();
         drop(runtime);
     }