diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php
index 27f11ca34f..5d263eaffb 100644
--- a/pandora_console/include/class/CredentialStore.class.php
+++ b/pandora_console/include/class/CredentialStore.class.php
@@ -760,16 +760,16 @@ class CredentialStore extends Wizard
                     'form'                => [
                         'inputs' => [
                             [
-                                'label'          => __('Group'),
-                                'type'           => 'select_groups',
-                                'id'             => 'filter_id_group',
-                                'name'           => 'filter_id_group',
-                                'returnAllGroup' => false,
-                                'privilege'      => 'AR',
-                                'type'           => 'select_groups',
-                                'selected'       => $id_group_filter,
-                                'return'         => true,
-                                'size'           => '80%',
+                                'label'     => __('Group'),
+                                'type'      => 'select_groups',
+                                'id'        => 'filter_id_group',
+                                'name'      => 'filter_id_group',
+                                'privilege' => 'AR',
+                                'type'      => 'select_groups',
+                                'nothing'   => false,
+                                'selected'  => (defined($id_group_filter) ? $id_group_filter : 0),
+                                'return'    => true,
+                                'size'      => '80%',
                             ],
                             [
                                 'label' => __('Free search'),
@@ -846,13 +846,14 @@ class CredentialStore extends Wizard
         $inputs[] = [
             'label'     => __('Group'),
             'arguments' => [
-                'name'        => 'id_group',
-                'id'          => 'id_group',
-                'input_class' => 'flex-row',
-                'type'        => 'select_groups',
-                'selected'    => $values['id_group'],
-                'return'      => true,
-                'class'       => 'w50p',
+                'name'           => 'id_group',
+                'id'             => 'id_group',
+                'input_class'    => 'flex-row',
+                'type'           => 'select_groups',
+                'returnAllGroup' => false,
+                'selected'       => $values['id_group'],
+                'return'         => true,
+                'class'          => 'w50p',
             ],
         ];
 
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 433cb341cc..754db65a18 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -560,6 +560,7 @@ function html_print_select_groups(
                                     inclusions: '<?php echo $json_inclusions; ?>',
                                     step: params.page || 1,
                                     strict: "<?php echo $strict_user; ?>",
+                                    returnAllGroup: <?php echo (int) $returnAllGroup; ?>
                                 }
 
                                 return query;
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 9bd0777472..557fd492da 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -871,10 +871,11 @@ if (is_metaconsole() !== true) {
 $data = html_print_input(
     [
         'name'           => 'id_group_filter',
-        'returnAllGroup' => false,
+        'returnAllGroup' => true,
         'privilege'      => 'AR',
         'type'           => 'select_groups',
-        'selected'       => $id_group_filter,
+        'selected'       => (defined($id_group_filter) ? $id_group_filter : 0),
+        'nothing'        => false,
         'return'         => true,
         'size'           => '80%',
     ]