diff --git a/main/admin/system_announcements.php b/main/admin/system_announcements.php
index a7a218dd34..14fb7b6e76 100755
--- a/main/admin/system_announcements.php
+++ b/main/admin/system_announcements.php
@@ -176,9 +176,9 @@ if ($action_todo) {
             get_lang('AnnouncementForGroup'),
             $group_list
         );
-    }
 
-    $values['group'] = isset($values['group']) ? $values['group'] : '0';
+        $values['group'] = isset($values['group']) ? $values['group'] : '0';
+    }
 
     $form->addElement('checkbox', 'send_mail', null, get_lang('SendMail'));
 
@@ -233,7 +233,7 @@ if ($action_todo) {
                 if ($announcement_id !== false) {
                     SystemAnnouncementManager::announcement_for_groups(
                         $announcement_id,
-                        array($values['group'])
+                        isset($values['group']) ? [$values['group']] : []
                     );
                     Display :: display_confirmation_message(get_lang('AnnouncementAdded'));
                 } else {
@@ -260,7 +260,7 @@ if ($action_todo) {
                 ) {
                     SystemAnnouncementManager::announcement_for_groups(
                         $values['id'],
-                        array($values['group'])
+                        isset($values['group']) ? [$values['group']] : []
                     );
                     Display :: display_confirmation_message(get_lang('AnnouncementUpdated'));
                 } else {