diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 772faed829..67e0c906e9 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -181,7 +181,7 @@ function events_get_events_no_grouped(
 
     $table = events_get_events_table($meta, $history);
 
-    $sql = 'SELECT * FROM '.$table.' WHERE 1=1 '.$sql_post;
+    $sql = 'SELECT * FROM '.$table.' te WHERE 1=1 '.$sql_post;
 
     $events = db_get_all_rows_sql($sql, $history_db);
 
@@ -1628,7 +1628,7 @@ function events_get_agent(
     }
 
     if (is_metaconsole() && $id_server) {
-        $sql_where .= ' AND server_id = 0';
+        $sql_where .= ' AND server_id = '.$id_server;
     }
 
     if ($show_summary_group) {
@@ -1636,7 +1636,7 @@ function events_get_agent(
             $sql_where,
             0,
             1000,
-            is_metaconsole();
+            is_metaconsole(),
             false,
             false,
             $history