3 files changed, 7 insertions, 7 deletions
diff --git a/webapp/stores/emoji_store.jsx b/webapp/stores/emoji_store.jsx
index e369885b4..076e671dd 100644
--- a/webapp/stores/emoji_store.jsx
+++ b/webapp/stores/emoji_store.jsx
@@ -17,6 +17,8 @@ class EmojiStore extends EventEmitter {
 
         this.dispatchToken = AppDispatcher.register(this.handleEventPayload.bind(this));
 
+        this.setMaxListeners(600);
+
         this.emojis = new Map(EmojiJson);
         this.systemEmojis = new Map(EmojiJson);
 
diff --git a/webapp/stores/preference_store.jsx b/webapp/stores/preference_store.jsx
index 654036ae8..8aecfff40 100644
--- a/webapp/stores/preference_store.jsx
+++ b/webapp/stores/preference_store.jsx
@@ -8,7 +8,7 @@ import EventEmitter from 'events';
 
 const CHANGE_EVENT = 'change';
 
-class PreferenceStoreClass extends EventEmitter {
+class PreferenceStore extends EventEmitter {
     constructor() {
         super();
 
@@ -17,7 +17,7 @@ class PreferenceStoreClass extends EventEmitter {
 
         this.preferences = new Map();
 
-        this.setMaxListeners(20);
+        this.setMaxListeners(600);
     }
 
     getKey(category, name) {
@@ -144,7 +144,5 @@ class PreferenceStoreClass extends EventEmitter {
     }
 }
 
-const PreferenceStore = new PreferenceStoreClass();
-PreferenceStore.setMaxListeners(25);
-export default PreferenceStore;
-global.window.PreferenceStore = PreferenceStore;
+global.PreferenceStore = new PreferenceStore();
+export default global.PreferenceStore;
+\ No newline at end of file
diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx
index 6a47d0f65..859f385c0 100644
--- a/webapp/stores/user_store.jsx
+++ b/webapp/stores/user_store.jsx
@@ -334,7 +334,7 @@ class UserStoreClass extends EventEmitter {
 }
 
 var UserStore = new UserStoreClass();
-UserStore.setMaxListeners(16);
+UserStore.setMaxListeners(600);
 
 UserStore.dispatchToken = AppDispatcher.register((payload) => {
     var action = payload.action;