diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index ed41aee0ef..08688c623b 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -1842,6 +1842,10 @@ function insert_downtime_agent($id_downtime, $user_groups_ad)
     $(document).ready (function () {
         populate_agents_selector();
 
+        // Add data-pendingdelete attribute to exclude delete_pending modules
+        document.querySelector("#id_agents").dataset.pendingdelete = true
+        document.querySelector("#modules_selection_mode").dataset.pendingdelete = true
+        
         $("#id_agents").change(agent_changed_by_multiple_agents);
         $("#modules_selection_mode").change(agent_changed_by_multiple_agents);
         
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 8b076265c9..91446d1464 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -246,7 +246,8 @@ function agent_changed_by_multiple_agents(event, id_agent, selected) {
       serialized: serialized,
       id_server: id_server,
       status_module: module_status,
-      id_group: id_group
+      id_group: id_group,
+      pendingdelete: event.target.dataset.pendingdelete // Get pendingdelete attribute from target
     },
     function(data) {
       $("#module").empty();
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index e2616b8d08..fa00195001 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -66,6 +66,7 @@ if (is_ajax()) {
     $agent_alias = get_parameter('alias', '');
     $agents_inserted = get_parameter('agents_inserted', []);
     $id_group = (int) get_parameter('id_group');
+    $pendingdelete = (bool) get_parameter('pendingdelete');
 
     $refresh_contact = get_parameter('refresh_contact', 0);
 
@@ -735,6 +736,11 @@ if (is_ajax()) {
                         ($sql_tags_join === '') ? 'INNER JOIN tagente ON tagente.id_agente = t1.id_agente' : '',
                         (empty($where_tags)) ? '' : " WHERE 1=1 $where_tags"
                     );
+                    if ($pendingdelete == true) {
+                        $sql .= sprintf(
+                            ' AND delete_pending=0'
+                        );
+                    }
                 }
             } else {
                 $sql = sprintf(