diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index e46a64e8b2..05d7c5f292 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-21  Sergio Martin <sergio.martin@artica.es>
+
+	* operation/incidents/incident.list.php: fixed table
+	displayed instead of a message for bug 3372155
+
 2011-07-21  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_users.php
diff --git a/pandora_console/operation/incidents/incident.list.php b/pandora_console/operation/incidents/incident.list.php
index 30e86cc5fa..31253bab0c 100644
--- a/pandora_console/operation/incidents/incident.list.php
+++ b/pandora_console/operation/incidents/incident.list.php
@@ -135,5 +135,10 @@ foreach ($incidents as $row) {
 	array_push ($table->data, $data);
 }
 
-html_print_table ($table);
+if(isset($data)) {
+	html_print_table ($table);
+}
+else {
+	echo "<div class='nf'>".__('There are no defined incidents')."</div>";
+}
 ?>