diff --git a/charms/openstack-exporter-k8s/src/prometheus_alert_rules/cinder_rules.yaml b/charms/openstack-exporter-k8s/src/prometheus_alert_rules/cinder_rules.yaml
index 514616b3..f519c73d 100644
--- a/charms/openstack-exporter-k8s/src/prometheus_alert_rules/cinder_rules.yaml
+++ b/charms/openstack-exporter-k8s/src/prometheus_alert_rules/cinder_rules.yaml
@@ -2,7 +2,7 @@ groups:
 - name: Cinder
   rules:
     - alert: CinderStateWarning
-      expr: openstack_cinder_agent_state{adminState="disabled"}
+      expr: count without (uuid) (openstack_cinder_agent_state{adminState="disabled"}) > 0
       for: 5m
       labels:
         severity: warning
@@ -13,7 +13,7 @@ groups:
             LABELS = {{ $labels }}
 
     - alert: CinderStateCritical
-      expr: openstack_cinder_agent_state{adminState="enabled"} == 0
+      expr: count without (uuid) (openstack_cinder_agent_state{adminState="enabled"} == 0) > 0
       for: 5m
       labels:
         severity: critical