diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index f1829ef192..16b09a7671 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -123,6 +123,8 @@ else {
 	}
 }
 
+
+
 if ($meta) {
 	//There is another filter.
 }
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 8ad9e23852..02409525ca 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -224,12 +224,14 @@ $server_id = (int)get_parameter('server_id', 0);
 
 
 
-$text_agent = (string) get_parameter("text_agent");
+$text_agent = (string) get_parameter("text_agent", __('All'));
+
 $id_agent = get_parameter('id_agent', 0);
 if ($id_agent != 0) {
 	$text_agent = db_get_value('nombre', 'tagente', 'id_agente', $id_agent);
 	if ($text_agent == false) {
-		$text_agent = '';
+		$text_agent =  __('All');
+		$id_agent = 0;
 	}
 }
 
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 737a4b9ee8..af2d9490cd 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -141,11 +141,13 @@ $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_use
 // Get the tags where the user have permissions in Events reading tasks
 $tags = tags_get_user_tags($config['id_user'], 'ER');
 
-
 if ($id_agent == 0 && $text_agent != __('All')) {
 	$id_agent = -1;
 }
 
+
+
+
 /////////////////////////////////////////////
 // Build the condition of the events query