diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 347fa60dc..3e6ce0a2e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -321,7 +321,9 @@ module.exports = class MetamaskController extends EventEmitter {
   setupPublicConfig (outStream) {
     pipe(
       this.publicConfigStore,
-      outStream
+      outStream,
+      // cleanup on disconnect
+      () => this.publicConfigStore.unpipe(outStream)
     )
   }