diff --git a/unleash-server/public/js/unleash.jsx b/unleash-server/public/js/unleash.jsx
index 6f085b4706..3eda97aee5 100644
--- a/unleash-server/public/js/unleash.jsx
+++ b/unleash-server/public/js/unleash.jsx
@@ -209,7 +209,7 @@ var Unleash = React.createClass({
             savedFeatures: [],
             unsavedFeatures: [],
             errors: [],
-            poller: null
+            timer: null
         };
     },
 
@@ -219,6 +219,12 @@ var Unleash = React.createClass({
         this.state.timer.start();
     },
 
+    componentWillUnmount: function () {
+        if (this.state.timer != null) {
+            this.state.timer.stop();
+        }
+    },
+
     loadFeaturesFromServer: function () {
         reqwest('features').then(this.setFeatures, this.handleError);
     },