diff --git a/js/stores/appStoreRenderer.js b/js/stores/appStoreRenderer.js
index b608a1d260f..af284b4ff95 100644
--- a/js/stores/appStoreRenderer.js
+++ b/js/stores/appStoreRenderer.js
@@ -13,6 +13,9 @@ class AppStoreRenderer extends EventEmitter {
   constructor () {
     super()
     this.appState = new Immutable.Map()
+    // Many components can subscribe to changes in store state
+    // so ignore any memory-leak warning about having more than 10 listeners.
+    this.setMaxListeners(0)
   }
   emitChanges () {
     if (lastEmittedState !== this.appState) {
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
index 11e055ec6ec..94dba773f3f 100644
--- a/js/stores/windowStore.js
+++ b/js/stores/windowStore.js
@@ -57,6 +57,13 @@ let currentKey = 0
 const incrementNextKey = () => ++currentKey
 
 class WindowStore extends EventEmitter {
+  constructor() {
+    super()
+    // Many components can subscribe to changes in store state
+    // so ignore any memory-leak warning about having more than 10 listeners.
+    this.setMaxListeners(0)
+  }
+
   getState () {
     return windowState
   }