diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d33514e6a1..c74fbb26c8 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* godmode/agentes/configurar_agente.php: delete the simple alerts
+	asociated to deleted module.
+
 2009-11-30  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions_agents.php: fix now don't show alerts with
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 176651f185..e3e04d1e6f 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -592,6 +592,9 @@ if (isset ($_GET["delete_module"])){ // DELETE agent module !
 
 	if (process_sql ("DELETE FROM tagente_datos_inc WHERE id_agente_modulo = ".$id_borrar_modulo) === false)
 		$error++;
+
+	if (process_sql ("DELETE FROM talert_template_modules WHERE id_agent_module = ".$id_borrar_modulo) === false)
+		$error++;
 	
 
 	//Check for errors