diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 22a3d46eaa..e97fa7cf39 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1385,11 +1385,7 @@ if ($update_module || $create_module) {
     $ff_type = (int) get_parameter('ff_type');
     $each_ff = (int) get_parameter('each_ff');
     $ff_timeout = (int) get_parameter('ff_timeout');
-    $unit = (string) get_parameter('unit_select');
-    if ($unit == 'none') {
-        $unit = (string) get_parameter('unit_text');
-    }
-
+    $unit = (string) get_parameter('unit');
     $id_tag = (array) get_parameter('id_tag_selected');
     $serialize_ops = (string) get_parameter('serialize_ops');
     $critical_instructions = (string) get_parameter('critical_instructions');
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index f52707cb2a..013aa83498 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -1930,11 +1930,7 @@ function process_manage_edit($module_name, $agents_select=null, $module_status='
 
             case 'unit_select':
                 if ($value != -1) {
-                    if ($value == 'none') {
-                        $values['unit'] = (string) get_parameter('unit_text');
-                    } else {
-                        $values['unit'] = $value;
-                    }
+                    $values['unit'] = (string) get_parameter('unit');
                 }
             break;