diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm
index 8325e7715a..ae0dfbc5c5 100644
--- a/pandora_server/lib/PandoraFMS/NetworkServer.pm
+++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm
@@ -462,7 +462,7 @@ sub exec_network_module ($$$$) {
 	my $retries = $module->{'max_retries'};
 
 	# Use the agent address by default
-	if (! defined($ip_target) || $ip_target eq '') {
+	if (! defined($ip_target) || $ip_target eq '' || $ip_target eq 'auto') {
 		$ip_target = $agent_row->{'direccion'};
 	}