diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d085fb3d8f..386fc030ca 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-30  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/fgraph.php: Limit the number of agents in modules per agent
+	  charts.
+
 2009-06-30  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/functions_fsgraph.php: Truncate long names for flash charts.
diff --git a/pandora_console/include/fgraph.php b/pandora_console/include/fgraph.php
index a95f344e79..382fab2733 100644
--- a/pandora_console/include/fgraph.php
+++ b/pandora_console/include/fgraph.php
@@ -717,7 +717,7 @@ function graph_db_agentes_modulos ($width, $height) {
 	
 	$modules = get_db_all_rows_sql ('SELECT COUNT(id_agente_modulo),id_agente
 					FROM tagente_modulo GROUP BY id_agente
-					ORDER BY 1 DESC');
+					ORDER BY 1 DESC LIMIT 8');
 	if ($modules === false)
 		$modules = array ();