diff --git a/html/includes/table/alertlog.inc.php b/html/includes/table/alertlog.inc.php
index 8b4d94d3e2..bbc1df9e8a 100644
--- a/html/includes/table/alertlog.inc.php
+++ b/html/includes/table/alertlog.inc.php
@@ -7,6 +7,11 @@ if (is_numeric($_POST['device_id'])) {
     $param[] = $_POST['device_id'];
 }
 
+if ($_POST['state'] >= 0) {
+    $where .= ' AND `E`.`state` = ?';
+    $param[] = mres($_POST['state']);
+}
+
 if ($_SESSION['userlevel'] >= '5') {
     $sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id WHERE $where";
 }
diff --git a/html/pages/alert-log.inc.php b/html/pages/alert-log.inc.php
index 752be46cef..4a2655d16b 100644
--- a/html/pages/alert-log.inc.php
+++ b/html/pages/alert-log.inc.php
@@ -59,6 +59,16 @@ foreach (get_all_devices() as $hostname) {
     }
 }
 ?>
+               "</select>"+
+               "</div>"+
+               "<div class=\"form-group\">"+
+               "<label>"+
+               "<strong>&nbsp;State&nbsp;</strong>"+
+               "</label>"+
+               "<select name=\"state\" id=\"state\" class=\"form-control input-sm\">"+
+               "<option value=\"-1\"></option>"+
+               "<option value=\"0\">Ok</option>"+
+               "<option value=\"1\">Alert</option>"+
                "</select>"+
                "</div>"+
                "<button type=\"submit\" class=\"btn btn-default input-sm\">Filter</button>"+
@@ -69,7 +79,8 @@ foreach (get_all_devices() as $hostname) {
     {
         return {
             id: "alertlog",
-            device_id: '<?php echo htmlspecialchars($_POST['device_id']); ?>'
+            device_id: '<?php echo htmlspecialchars($_POST['device_id']); ?>',
+            state: '<?php echo htmlspecialchars($_POST['state']); ?>'
         };
     },
     url: "ajax_table.php"