diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index b9b8dcc973..9601a27a50 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -577,6 +577,9 @@ wuxserver 0
 # Port of the Selenium Grid Server.
 #wux_port 4444
 
+# Maximum timeout to connect to a target web site, also for communications with a Selenium Grid server.
+#wux_webagent_timeout 15
+
 # Enable (1) or disable (0) the Pandora FMS Syslog Server (PANDORA FMS ENTERPRISE ONLY).
 syslogserver 1
 
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index dce697a624..e3e6370130 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -453,6 +453,7 @@ sub pandora_load_config {
 	$pa_config->{"wux_host"} = undef; # 7.0
 	$pa_config->{"wux_port"} = 4444; # 7.0
 	$pa_config->{"wux_browser"} = "*firefox"; # 7.0
+	$pa_config->{"wux_webagent_timeout"} = 15; # 7.0
 
 	# Syslog Server
 	$pa_config->{"syslogserver"} = 1; # 7.0.716
@@ -1068,6 +1069,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^wux_browser\s+(.*)/i) {
 			$pa_config->{'wux_browser'}= clean_blank($1);
 		}
+		elsif ($parametro =~ m/^wux_webagent_timeout\s+([0-9]*)/i) {
+			$pa_config->{'wux_webagent_timeout'}= clean_blank($1);
+		}
 		elsif ($parametro =~ m/^syslogserver\s+([0-1])/i) {
 			$pa_config->{'syslogserver'}= clean_blank($1);
 		}