diff --git a/common/task/src/runtime_registry.rs b/common/task/src/runtime_registry.rs
index c74fcfde1b3..11be65331df 100644
--- a/common/task/src/runtime_registry.rs
+++ b/common/task/src/runtime_registry.rs
@@ -39,7 +39,9 @@ impl RuntimeRegistry {
             .write()
             .map_err(|_| RegistryAccessError::Poisoned)?;
         Ok(guard
-            .get_or_insert_with(|| Arc::new(ShutdownManager::new_without_signals()))
+            .get_or_insert_with(|| {
+                Arc::new(ShutdownManager::new_without_signals().with_cancel_on_panic())
+            })
             .clone())
     }