1 files changed, 5 insertions, 12 deletions

diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index 5ea74e0af..c087689a7 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -1,11 +1,9 @@
-import { reaction, runInAction } from 'mobx';
+import { reaction } from 'mobx';
 import { AnnouncementsStore } from './store';
-import api from './api';
-import state, { resetState } from './state';
 
 const debug = require('debug')('Franz:feature:announcements');
 
-let store = null;
+export const announcementsStore = new AnnouncementsStore();
 
 export default function initAnnouncements(stores, actions) {
   // const { features } = stores;
@@ -19,15 +17,10 @@ export default function initAnnouncements(stores, actions) {
     (isEnabled) => {
       if (isEnabled) {
         debug('Initializing `announcements` feature');
-        store = new AnnouncementsStore(stores, api, actions, state);
-        store.initialize();
-        runInAction(() => { state.isFeatureActive = true; });
-      } else if (store) {
+        announcementsStore.start(stores, actions);
+      } else if (announcementsStore.isFeatureActive) {
         debug('Disabling `announcements` feature');
-        runInAction(() => { state.isFeatureActive = false; });
-        store.teardown();
-        store = null;
-        resetState(); // Reset state to default
+        announcementsStore.stop();
       }
     },
     {