diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index c9ef76edc1..f70fdb5fa2 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -146,11 +146,9 @@ $form_filter .= html_print_select_groups(false, 'AR', $return_all_group, 'ag_gro
 $form_filter .= '</td></tr>';
 
 $alert_status_filter = [];
-$alert_status_filter['all_enabled'] = __('All (Enabled)');
 $alert_status_filter['all'] = __('All');
 $alert_status_filter['fired'] = __('Fired');
 $alert_status_filter['notfired'] = __('Not fired');
-$alert_status_filter['disabled'] = __('Disabled');
 
 $form_filter .= "<tr><td style='font-weight: bold;'>".__('Status').'</td><td>';
 $form_filter .= html_print_select($alert_status_filter, 'status_alert', $status_alert, '', '', '', true);
@@ -187,8 +185,12 @@ $total = 0;
 $where = '';
 
 if ($searchFlag) {
-    if ($status_alert != -1 && $status_alert != '') {
-        $where .= ' ';
+    if ($status_alert == 'fired' && $status_alert != 'all') {
+        $where .= ' AND id_alert_template IN (SELECT id FROM talert_template_modules WHERE times_fired > 0)';
+    }
+
+    if ($status_alert == 'notfired' && $status_alert != 'all') {
+        $where .= ' AND id_alert_template IN (SELECT id FROM talert_template_modules WHERE times_fired = 0)';
     }
 
     if ($priority != -1 && $priority != '') {
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index c94c0f7025..6402fa638b 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -65,6 +65,7 @@ $searchType = get_parameter('search_type', '');
 $priority = get_parameter('priority', '');
 $searchFlag = get_parameter('search', 0);
 $enabledisable = get_parameter('enabledisable', '');
+$status_alert = get_parameter('status_alert', '');
 $standby = get_parameter('standby', '');
 $pure = get_parameter('pure', 0);
 $ag_group = get_parameter('ag_group', 0);