diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index cd7ab3843..2a8a282e2 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -171,15 +171,15 @@ template(name='announcementSettings')
   ul#announcement-setting.setting-detail
     li
       a.flex.js-toggle-activemessage
-        .materialCheckBox(class="{{#if currentSetting.enabled}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if currentAnnouncements.enabled}}is-checked{{/if}}")
 
         span {{_ 'admin-announcement-active'}}
     li
-      .admin-announcement(class="{{#if currentSetting.enabled}}{{else}}hide{{/if}}")
+      .admin-announcement(class="{{#if currentAnnouncements.enabled}}{{else}}hide{{/if}}")
         ul
           li
             .title {{_ 'admin-announcement-title'}}
-            textarea#admin-announcement.wekan-form-control= currentSetting.body
+            textarea#admin-announcement.wekan-form-control= currentAnnouncements.body
           li
             button.js-announcement-save.primary {{_ 'save'}}
 
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index 52e61f56c..aa5608ce2 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -412,7 +412,7 @@ BlazeComponent.extendComponent({
     this.loading.set(w);
   },
 
-  currentSetting() {
+  currentAnnouncements() {
     return Announcements.findOne();
   },
 
@@ -427,8 +427,9 @@ BlazeComponent.extendComponent({
 
   toggleActive() {
     this.setLoading(true);
-    const isActive = this.currentSetting().enabled;
-    Announcements.update(Announcements.findOne()._id, {
+    const announcements = this.currentAnnouncements();
+    const isActive = announcements.enabled;
+    Announcements.update(announcements._id, {
       $set: { enabled: !isActive },
     });
     this.setLoading(false);