diff --git a/src/core/ShareDataSet.js b/src/core/ShareDataSet.js
index acfcabf..e2db075 100644
--- a/src/core/ShareDataSet.js
+++ b/src/core/ShareDataSet.js
@@ -46,6 +46,13 @@ export default class ShareDataSet extends Component {
     return trivialProducer;
   }
 
+  componentWillUnmount() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
+  }
+
   render() {
     this.update();
     return (