diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 3f9fe1a6b2..14c8d31813 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -1017,40 +1017,58 @@ function servers_get_info($id_server=-1)
                 // Remote servers LAG Calculation (server_type != 0).
                 if ($server['server_type'] != 0) {
                     // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
-                    $result = db_get_row_sql(
-                        'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
-                            AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS "lag"
-                        FROM tagente_estado, tagente_modulo, tagente
-                        WHERE utimestamp > 0
-                            AND tagente.disabled = 0
-                            AND tagente.id_agente = tagente_estado.id_agente
-                            AND tagente_modulo.disabled = 0
-                            AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-                            AND current_interval > 0
-                            AND running_by = '.$server['id_server'].'
-                            AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
-                            AND (UNIX_TIMESTAMP() - utimestamp) > current_interval'
+                    $sql = sprintf(
+                        'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
+                        AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag" 
+                        FROM (
+                          SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
+                              FROM tagente_estado
+                                    WHERE tagente_estado.current_interval > 0
+                                    AND tagente_estado.last_execution_try > 0
+                                    AND tagente_estado.running_by = %d
+                        ) tae
+                    JOIN (
+                            SELECT tagente_modulo.id_agente_modulo
+                                FROM tagente_modulo LEFT JOIN tagente
+                                ON tagente_modulo.id_agente = tagente.id_agente
+                                    WHERE tagente.disabled = 0
+                                    AND tagente_modulo.disabled = 0
+                        ) tam
+                    ON tae.id_agente_modulo = tam.id_agente_modulo
+                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
+                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
+                        $server['id_server']
                     );
                 } else {
                     // Local/Dataserver server LAG calculation.
                     // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
-                    $result = db_get_row_sql(
-                        'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
-                            AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS "lag"
-                        FROM tagente_estado, tagente_modulo, tagente
-                        WHERE utimestamp > 0
-                            AND tagente.disabled = 0
-                            AND tagente.id_agente = tagente_estado.id_agente
-                            AND tagente_modulo.disabled = 0
-                            AND tagente_modulo.id_tipo_modulo < 5
-                            AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-                            AND current_interval > 0
-                            AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
-                            AND running_by = '.$server['id_server'].'
-                            AND (UNIX_TIMESTAMP() - utimestamp) > (current_interval * 1.1)'
+                    $sql = sprintf(
+                        'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
+                            AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag"
+                        FROM (
+                          SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
+                              FROM tagente_estado
+                                    WHERE tagente_estado.current_interval > 0
+                                    AND tagente_estado.last_execution_try > 0
+                                    AND tagente_estado.running_by = %d
+                        ) tae
+                    JOIN (
+                            SELECT tagente_modulo.id_agente_modulo
+                                FROM tagente_modulo LEFT JOIN tagente
+                                ON tagente_modulo.id_agente = tagente.id_agente
+                                    WHERE tagente.disabled = 0
+                                    AND tagente_modulo.disabled = 0
+                                    AND tagente_modulo.id_tipo_modulo < 5
+                        ) tam
+                    ON tae.id_agente_modulo = tam.id_agente_modulo
+                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
+                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
+                        $server['id_server']
                     );
                 }
 
+                $result = db_get_row_sql($sql);
+
                 // Lag over current_interval * 2 is not lag,
                 // it's a timed out module.
                 if (!empty($result['lag'])) {