diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 37acc9c347..ea9b73a0ae 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/functions_alerts.php: Fixed alerts_get_agents_with_alert_template
+	function in order to not retrieve delete modules.
+
+	Fixes: #3401666
+
 2011-08-31  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* extensions/update_manager/lib/libupdate_manager_client.php,
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 144bbe7662..63e1dc7bad 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -1587,6 +1587,8 @@ function alerts_get_agents_with_alert_template ($id_alert_template, $id_group, $
 	$filter[] = 'tagente_modulo.id_agente_modulo = talert_template_modules.id_agent_module';
 	$filter[] = 'tagente_modulo.id_agente = tagente.id_agente';
 	$filter['id_alert_template'] = $id_alert_template;
+	$filter['tagente_modulo.disabled'] = '<> 1';
+	$filter['delete_pending'] = '<> 1';
 	if (empty ($id_agents)) {
 		switch ($config["dbtype"]) {
 			case "mysql":