diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 72681bc7e7..a74bc41f65 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-25  Sergio Martin <sergio.martin@artica.es>
+
+	* include/javascript/pandora_events.js
+	include/ajax/events.php: Change command timeouts in responses
+	from 10 to 9 seconds to avoid problems in certain systems. Add
+	little feedback when command reach timeout time
+
 2014-02-20  Miguel de Dios <miguel.dedios@artica.es>
 	
 	* godmode/agentes/fields_manager.php: added the id column in the
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 7f69ed3f7c..6b8bf23e5d 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -132,7 +132,7 @@ if ($perform_event_response) {
 			$timeout_bin = '/usr/bin/timeout';
 			break;
 	}
-	echo system($timeout_bin . ' 10 '.io_safe_output($command).' 2>&1');
+	echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
 	
 	return;
 }
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 6d6fc9caa1..4e326526a4 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -353,8 +353,13 @@ function perform_response(target) {
 		timeout: 10000,
 		dataType: 'html',
 		success: function (data) {
-			var out = data.replace(/[\n|\r]/g, "<br>");
-			$('#response_out').html(out);
+			if (data == '') {
+				$('#response_out').html('<i>No output</i>');
+			}
+			else {
+				var out = data.replace(/[\n|\r]/g, "<br>");
+				$('#response_out').html(out);
+			}
 			$('#response_loading_command').hide();
 			$('#re_exec_command').show();
 		}