diff --git a/core/broadcast/src/ev.rs b/core/broadcast/src/ev.rs
index b015a8ec0..af67b0556 100644
--- a/core/broadcast/src/ev.rs
+++ b/core/broadcast/src/ev.rs
@@ -534,9 +534,14 @@ impl<C: Collection> Context<LightningBackend<C>> {
     where
         Self: Send,
     {
-        tokio::spawn(async move {
-            self.run(waiter).await;
-        });
+        let panic_waiter = waiter.clone();
+        spawn!(
+            async move {
+                self.run(waiter).await;
+            },
+            "BROADCAST",
+            crucial(panic_waiter)
+        );
     }
 }