diff --git a/src/core/study_processor.ts b/src/core/study_processor.ts
index b3e914e7..a79f0a49 100644
--- a/src/core/study_processor.ts
+++ b/src/core/study_processor.ts
@@ -155,7 +155,14 @@ export class StudyDetails {
       console.error('Bad study ' + JSON.stringify(study));
       return;
     }
-    this.isEmergency = study.name.match(/KillSwitch/) !== null;
+    const isKillSwitch = (s: string) => {
+      return s.match(/(K|k)ill(S|s)witch/) !== null;
+    };
+    this.isEmergency =
+      isKillSwitch(study.name) ||
+      study.experiment?.find(
+        (e) => e.probability_weight > 0 && isKillSwitch(e.name),
+      ) !== undefined;
 
     if (maxVersion != null) {
       const parsed = parseVersionPattern(maxVersion);