diff --git a/CHANGELOG.md b/CHANGELOG.md
index 905f1f98f..61b89580b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Bump limit for EventEmitter listeners before warning.
+
 ## 3.13.7 2018-1-22
 
 - Add ability to bypass gas estimation loading indicator.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 000e17b9e..672ec7403 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -43,6 +43,8 @@ module.exports = class MetamaskController extends EventEmitter {
   constructor (opts) {
     super()
 
+    this.defaultMaxListeners = 20
+
     this.sendUpdate = debounce(this.privateSendUpdate.bind(this), 200)
 
     this.opts = opts