diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index 5c6434c8bd..57a69dd3ad 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -1075,8 +1075,6 @@ class Tree
 				ON ta.id_agente = tasg.id_agent
 			LEFT JOIN talert_template_modules tatm
 				ON tatm.id_agent_module = tam.id_agente_modulo
-                AND tatm.id_alert_template = 1 
-				OR tatm.id_alert_template = NULL
 			$inner
 			WHERE tam.disabled = 0 AND ta.disabled = 0
 				$condition
@@ -1086,7 +1084,8 @@ class Tree
 				$agent_status_filter
 				$module_search_filter
 				$tag_condition
-			ORDER BY tam.nombre ASC, tam.id_agente_modulo ASC";
+            GROUP BY tam.id_agente_modulo
+            ORDER BY tam.nombre ASC, tam.id_agente_modulo ASC";
 
         return $sql;
     }