diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index bacbad708d..d50c2c1100 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -1381,6 +1381,12 @@ if ($get_extended_event) {
             'EW',
             $event['clean_tags'],
             $childrens_ids
+        )) || (tags_checks_event_acl(
+            $config['id_user'],
+            $event['id_grupo'],
+            'ER',
+            $event['clean_tags'],
+            $childrens_ids
         )))
     ) {
         $tabs .= "<li><a href='#extended_event_responses_page' id='link_responses'>".html_print_image(
@@ -1444,6 +1450,12 @@ if ($get_extended_event) {
             'EW',
             $event['clean_tags'],
             $childrens_ids
+        )) || (tags_checks_event_acl(
+            $config['id_user'],
+            $event['id_grupo'],
+            'ER',
+            $event['clean_tags'],
+            $childrens_ids
         )))
     ) {
         $responses = events_page_responses($event);
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 9a8f2b8a1c..ea85ed589b 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3669,22 +3669,37 @@ function events_page_responses($event, $childrens_ids=[])
         );
     }
 
-    $table_responses->data[] = $data;
+    if ((tags_checks_event_acl(
+        $config['id_user'],
+        $event['id_grupo'],
+        'EM',
+        $event['clean_tags'],
+        $childrens_ids
+    )) || (tags_checks_event_acl(
+        $config['id_user'],
+        $event['id_grupo'],
+        'EW',
+        $event['clean_tags'],
+        $childrens_ids
+    ))
+    ) {
+        $table_responses->data[] = $data;
 
-    // Comments.
-    $data = [];
-    $data[0] = __('Comment');
-    $data[1] = '';
-    $data[2] = html_print_button(
-        __('Add comment'),
-        'comment_button',
-        false,
-        '$(\'#link_comments\').trigger(\'click\');',
-        'class="sub next w70p"',
-        true
-    );
+        // Comments.
+        $data = [];
+        $data[0] = __('Comment');
+        $data[1] = '';
+        $data[2] = html_print_button(
+            __('Add comment'),
+            'comment_button',
+            false,
+            '$(\'#link_comments\').trigger(\'click\');',
+            'class="sub next w70p"',
+            true
+        );
 
-    $table_responses->data[] = $data;
+        $table_responses->data[] = $data;
+    }
 
     if (tags_checks_event_acl(
         $config['id_user'],
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 89f832f5a5..dd0275924a 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -1608,8 +1608,20 @@ try {
 }
 
 // Event responses.
-$sql_event_resp = "SELECT id, name FROM tevent_response WHERE type LIKE 'command'";
-$event_responses = db_get_all_rows_sql($sql_event_resp);
+if (is_user_admin($config['id_user'])) {
+    $sql_event_resp = "SELECT id, name FROM tevent_response WHERE type LIKE 'command'";
+    $event_responses = db_get_all_rows_sql($sql_event_resp);
+} else {
+    $id_groups = array_keys(users_get_groups(false, 'EW'));
+    $event_responses = db_get_all_rows_filter(
+        'tevent_response',
+        [
+            'id_group' => $id_groups,
+            'type'     => 'command',
+        ]
+    );
+}
+
 
 if ($config['event_replication'] != 1) {
     if ($event_w && !$readonly) {