diff --git a/html/includes/print-alert-rules.php b/html/includes/print-alert-rules.php
index eac1ae6fd8..8d93e23c09 100644
--- a/html/includes/print-alert-rules.php
+++ b/html/includes/print-alert-rules.php
@@ -155,7 +155,7 @@ $start      = (($page_number - 1) * $results);
 $full_query = $full_query.$query." LIMIT $start,$results";
 
 foreach (dbFetchRows($full_query, $param) as $rule) {
-    $sub   = dbFetchRows('SELECT * FROM alerts WHERE rule_id = ? ORDER BY id DESC LIMIT 1', array($rule['id']));
+    $sub   = dbFetchRows('SELECT * FROM alerts WHERE rule_id = ? ORDER BY `state` DESC, `id` DESC LIMIT 1', array($rule['id']));
     $ico   = 'ok';
     $col   = 'success';
     $extra = '';
@@ -165,16 +165,11 @@ foreach (dbFetchRows($full_query, $param) as $rule) {
             $ico = 'ok';
             $col = 'success';
         }
-        else if ((int) $sub['state'] === 1) {
+        elseif ((int) $sub['state'] === 1 || (int) $sub['state'] === 2) {
             $ico   = 'remove';
             $col   = 'danger';
             $extra = 'danger';
         }
-        else if ((int) $sub['state'] === 2) {
-            $ico   = 'time';
-            $col   = 'default';
-            $extra = 'warning';
-        }
     }
 
     $alert_checked = '';