diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c7f5f3a6ce..49059aa724 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-12  Sergio Martin <sergio.martin@artica.es>
+
+	* operation/snmpconsole/snmp_view.php: Fixed the trap generator
+	to be enabled ever 
+
 2011-07-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/functions_events.php
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index bbbfaae9d5..525f81b5e7 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -164,12 +164,6 @@ if (($config['dbtype'] == 'oracle') && ($traps !== false)) {
 	}
 }
 
-// No traps 
-if (empty ($traps)) {
-	echo '<div class="nf">'.__('There are no SNMP traps in database').'</div>';
-	return;
-}
-
 $traps_generator = '<form method="POST" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&refr='.$config["refr"].'&pure='.$config["pure"].'">';
 $table->width = '90%';
 $table->size = array ();
@@ -206,6 +200,12 @@ $traps_generator .= '</form>';
 
 ui_toggle($traps_generator, __('Trap generator'));
 
+// No traps 
+if (empty ($traps)) {
+	echo '<div class="nf">'.__('There are no SNMP traps in database').'</div>';
+	return;
+}
+
 $table->width = '90%';
 $table->size = array ();
 $table->size[0] = '120px';