diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 48317411c9..5370b4d8b5 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -101,7 +101,9 @@ module.exports = React.createClass({
     },
 
     _rateLimitedUpdate: new RateLimitedFunc(function() {
-        this.setState({counters: this._computeCounters()})
+        if (SettingsStore.isFeatureEnabled("feature_state_counters")) {
+            this.setState({counters: this._computeCounters()});
+        }
     }, 500),
 
     _computeCounters: function() {