diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 4a92245..1db44dc 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -338,12 +338,16 @@
           threshold: 100
     - status: critical
       trigger:
-        logical_operator: or
+        logical_operator: and
         rules:
-        - function: percent
+        - function: count
+          arguments: [ okay, warning ]
+          relational_operator: '<='
+          threshold: 1
+        - function: count
           arguments: [ critical, down, unknown ]
-          relational_operator: '>='
-          threshold: 50
+          relational_operator: '>'
+          threshold: 0
     - status: warning
       trigger:
         logical_operator: or