diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js
index 22a10b2e6..6c7f38287 100644
--- a/src/components/draft/draft.js
+++ b/src/components/draft/draft.js
@@ -1,4 +1,3 @@
-import { cloneDeep } from 'lodash'
 import { defineAsyncComponent } from 'vue'
 
 import Gallery from 'src/components/gallery/gallery.vue'
@@ -6,7 +5,6 @@ import PostStatusForm from 'src/components/post_status_form/post_status_form.vue
 import StatusContent from 'src/components/status_content/status_content.vue'
 
 import { useDraftsStore } from 'src/stores/drafts.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useStatusesStore } from 'src/stores/statuses.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
diff --git a/src/components/extra_notifications/extra_notifications.js b/src/components/extra_notifications/extra_notifications.js
index d20cbb67e..70583bd2f 100644
--- a/src/components/extra_notifications/extra_notifications.js
+++ b/src/components/extra_notifications/extra_notifications.js
@@ -30,7 +30,7 @@ const ExtraNotifications = {
       return (
         this.mergedConfig.showExtraNotifications &&
         this.mergedConfig.showAnnouncementsInExtraNotifications &&
-        this.unreadAnnouncementCount
+        this.unreadAnnouncementsCount
       )
     },
     shouldShowFollowRequests() {
@@ -56,7 +56,7 @@ const ExtraNotifications = {
       return useUsersStore().currentUser
     },
     ...mapState(useAnnouncementsStore, {
-      unreadAnnouncementCount: 'unreadAnnouncementCount',
+      unreadAnnouncementsCount: 'unreadAnnouncementsCount',
     }),
     ...mapState(useMergedConfigStore, ['mergedConfig']),
     ...mapState(useChatsStore, ['unreadChatsCount']),
diff --git a/src/components/extra_notifications/extra_notifications.vue b/src/components/extra_notifications/extra_notifications.vue
index 329c5c1c3..6e21efcb2 100644
--- a/src/components/extra_notifications/extra_notifications.vue
+++ b/src/components/extra_notifications/extra_notifications.vue
@@ -31,7 +31,7 @@
           class="fa-scale-110 icon"
           icon="bullhorn"
         />
-        {{ $t('notifications.unread_announcements', { num: unreadAnnouncementCount }, unreadAnnouncementCount) }}
+        {{ $t('notifications.unread_announcements', { num: unreadAnnouncementsCount }, unreadAnnouncementsCount) }}
       </router-link>
     </div>
     <div
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index e7fe404e0..67e8c4418 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -70,7 +70,7 @@ const MobileNav = {
         countExtraNotifications(
           useMergedConfigStore().mergedConfig,
           useChatsStore().unreadChatsCount,
-          useAnnouncementsStore().unreadAnnouncementCount,
+          useAnnouncementsStore().unreadAnnouncementsCount,
           useFollowRequestsStore().followRequestsCount,
         )
       )
@@ -96,7 +96,7 @@ const MobileNav = {
     closingDrawerMarksAsSeen() {
       return useMergedConfigStore().mergedConfig.closingDrawerMarksAsSeen
     },
-    ...mapState(useAnnouncementsStore, ['unreadAnnouncementCount']),
+    ...mapState(useAnnouncementsStore, ['unreadAnnouncementsCount']),
     ...mapState(useMergedConfigStore, {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems).has('chats'),
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 8cdb70a1a..336ad60a6 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -19,7 +19,7 @@
             icon="bars"
           />
           <div
-            v-if="(unreadChatsCount && !chatsPinned) || unreadAnnouncementCount"
+            v-if="(unreadChatsCount && !chatsPinned) || unreadAnnouncementsCount"
             class="badge -dot -notification"
           />
         </button>
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index f5de8bb2c..e03a0c9d7 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -112,7 +112,7 @@ const NavPanel = {
   },
   computed: {
     ...mapState(useAnnouncementsStore, {
-      unreadAnnouncementCount: 'unreadAnnouncementCount',
+      unreadAnnouncementsCount: 'unreadAnnouncementsCount',
       supportsAnnouncements: (store) => store.supportsAnnouncements,
     }),
     ...mapState(useInstanceCapabilitiesStore, [
diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js
index 49392b37a..6186899e6 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -46,7 +46,7 @@ const NavigationEntry = {
     badges() {
       return {
         drafts: this.draftsCount,
-        unreadAnnouncements: this.unreadAnnouncementCount,
+        unreadAnnouncements: this.unreadAnnouncementsCount,
         followRequests: this.followRequestsCount,
         unreadChats: this.unreadChatsCount,
       }
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index c4773d833..d9a3e3a4a 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -59,7 +59,7 @@ const NavPanel = {
     badges() {
       return {
         drafts: this.draftsCount,
-        unreadAnnouncements: this.unreadAnnouncementCount,
+        unreadAnnouncements: this.unreadAnnouncementsCount,
         followRequests: this.followRequestsCount,
         unreadChats: this.unreadChatsCount,
       }
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 734671521..b1a1468ab 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -110,7 +110,7 @@ const Notifications = {
       return countExtraNotifications(
         useMergedConfigStore().mergedConfig,
         useChatsStore().unreadChatsCount,
-        useAnnouncementsStore().unreadAnnouncementCount,
+        useAnnouncementsStore().unreadAnnouncementsCount,
         useFollowRequestsStore().followRequestsCount,
       )
     },
@@ -118,7 +118,7 @@ const Notifications = {
       return (
         this.unseenNotifications.length +
         this.unreadChatsCount +
-        this.unreadAnnouncementCount
+        this.unreadAnnouncementsCount
       )
     },
     loading() {
@@ -157,7 +157,7 @@ const Notifications = {
     showExtraNotifications() {
       return !this.noExtra
     },
-    ...mapState(useAnnouncementsStore, ['unreadAnnouncementCount']),
+    ...mapState(useAnnouncementsStore, ['unreadAnnouncementsCount']),
     ...mapState(useChatsStore, ['unreadChatsCount']),
     ...mapState(useInterfaceStore, ['layoutType']),
   },
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index fb0152ece..6b3fad7fa 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -97,7 +97,7 @@ const SideDrawer = {
     ...mapState(useFollowRequestsStore, ['followRequestsCount']),
     ...mapState(useAnnouncementsStore, [
       'supportsAnnouncements',
-      'unreadAnnouncementCount',
+      'unreadAnnouncementsCount',
     ]),
     ...mapState(useInstanceCapabilitiesStore, [
       'pleromaChatMessagesAvailable',
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index a42287b3c..f7b0563ba 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -248,10 +248,10 @@
               icon="bullhorn"
             /> {{ $t("nav.announcements") }}
             <span
-              v-if="unreadAnnouncementCount"
+              v-if="unreadAnnouncementsCount"
               class="badge -notification"
             >
-              {{ unreadAnnouncementCount }}
+              {{ unreadAnnouncementsCount }}
             </span>
           </router-link>
         </li>
diff --git a/src/stores/announcements.js b/src/stores/announcements.js
index c78e79853..e06602dfe 100644
--- a/src/stores/announcements.js
+++ b/src/stores/announcements.js
@@ -16,7 +16,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
     userActions: {},
   }),
   getters: {
-    unreadAnnouncementCount() {
+    unreadAnnouncementsCount() {
       if (!useUsersStore().currentUser) {
         return 0
       }