diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index cedccd7840..1a714ed62f 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-18 Dario Rodriguez <dario.rodriguez@artica.es>
+
+        * operation/tree.php: Fixed a bug which shows groups
+        that only have empty agents.
+
+	MERGED FROM 4.0.2
+
 2012-06-18  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_menu.php: Added missed sec2 to the menu 
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 3e6c6db402..0648a8eda9 100644
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -735,7 +735,8 @@ function printTree_($type) {
 	$avariableGroups = users_get_groups (); //db_get_all_rows_in_table('tgrupo', 'nombre');	
 	
 	//Get all groups with agents
-	$full_groups = db_get_all_rows_sql("SELECT DISTINCT id_grupo FROM tagente");
+	$full_groups = db_get_all_rows_sql("SELECT DISTINCT tagente.id_grupo FROM tagente, tagente_estado WHERE 
+					tagente.id_agente = tagente_estado.id_agente AND tagente_estado.utimestamp != 0");
 	
 	$fgroups = array();