diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 288c154354..143cbadb9a 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,9 +1,16 @@
-2014-06-01  Miguel de Dios <miguel.dedios@artica.es>
+2014-06-02  Miguel de Dios <miguel.dedios@artica.es>
+	
+	* operation/snmpconsole/snmp_view.php: restored the lost code from
+	the branch 5.
+	
+	Incident: #845
+
+2014-06-02  Miguel de Dios <miguel.dedios@artica.es>
 	
 	* general/news_dialog.php: fixed the empty list of news in the first
 	login.
 
-2014-06-01  Miguel de Dios <miguel.dedios@artica.es>
+2014-06-02  Miguel de Dios <miguel.dedios@artica.es>
 	
 	* pandoradb_data.sql: fixed the insertion data of tnews, the lost
 	columns.
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index e659ca3c50..ee0ef48269 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -147,6 +147,11 @@ $table->size = array ();
 $table->size[0] = '120px';
 $table->data = array ();
 
+// All traps 
+$all_traps = db_get_all_rows_sql ("SELECT DISTINCT source FROM ttrap");
+if (empty($all_traps))
+	$all_traps = array();
+
 // Set filters
 $agents = array ();
 $oids = array ();