diff --git a/pandora_console/include/ajax/snmp_browser.ajax.php b/pandora_console/include/ajax/snmp_browser.ajax.php
index 9461dd8ca8..7bff27da4a 100644
--- a/pandora_console/include/ajax/snmp_browser.ajax.php
+++ b/pandora_console/include/ajax/snmp_browser.ajax.php
@@ -182,6 +182,7 @@ try {
 
         if ($method == 'snmp_browser_create_modules') {
             // Get target ids from form.
+            $use_agent_ip = get_parameter('use_agent_ip', '');
             $id_items = get_parameter('id_item2', null);
             $id_target = null;
             if (empty($id_items) === false) {
@@ -209,7 +210,8 @@ try {
                 $module_target,
                 $snmp_conf_values,
                 $id_target,
-                $server_to_exec
+                $server_to_exec,
+                $use_agent_ip
             );
 
             // Return fail modules for error/success message.
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index b670088f85..a039fcbc07 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -743,7 +743,8 @@ function modules_create_agent_module(
     string $name,
     array $values=[],
     bool $disableACL=false,
-    $tags=false
+    $tags=false,
+    $use_agent_ip=false,
 ) {
     global $config;
 
@@ -785,6 +786,10 @@ function modules_create_agent_module(
         return ERR_EXIST;
     }
 
+    if ($use_agent_ip === true) {
+        $values['ip_target'] = agents_get_address($id_agent);
+    }
+
     // Encrypt passwords.
     if (isset($values['plugin_pass']) === true) {
         // Avoid two times encryption.
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 745d61ef51..38ecabb0e0 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -1291,7 +1291,8 @@ function snmp_browser_create_modules_snmp(
     string $module_target,
     array $snmp_values,
     ?array $id_target,
-    ?string $server_to_exec=null
+    ?string $server_to_exec=null,
+    ?string $use_agent_ip=''
 ) {
     $target_ip = null;
     $target_port = null;
@@ -1350,6 +1351,12 @@ function snmp_browser_create_modules_snmp(
         }
     }
 
+    if (empty($use_agent_ip) === false) {
+        $use_agent_ip = true;
+    } else {
+        $use_agent_ip = false;
+    }
+
     $fail_modules = [];
 
     foreach ($targets_oids as $key => $target_oid) {
@@ -1514,7 +1521,7 @@ function snmp_browser_create_modules_snmp(
                     'history_data'          => 1,
                 ];
                 foreach ($id_target as $agent) {
-                    $ids[] = modules_create_agent_module($agent, $oid['oid'], $values);
+                    $ids[] = modules_create_agent_module($agent, $oid['oid'], $values, false, false, $use_agent_ip);
                 }
         } else if ($module_target == 'policy') {
             // Policies only in enterprise version.
@@ -1803,6 +1810,16 @@ function snmp_browser_print_create_module_massive(
         true
     );
 
+    $table->data[4][0] = html_print_label_input_block(
+        __('Use agent IP'),
+        html_print_checkbox(
+            'use_agent_ip',
+            1,
+            false,
+            true
+        )
+    );
+
     $output .= html_print_table($table, true);
 
     // SNMP extradata.