diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index b274e6a594..cb4d184eff 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -34,6 +34,10 @@ const FEATURES = [
         id: 'feature_pinning',
         name: _td("Message Pinning"),
     },
+    {
+        id: 'feature_presence_management',
+        name: _td("Presence Management"),
+    },
 ];
 
 export default {
diff --git a/src/components/views/avatars/MemberPresenceAvatar.js b/src/components/views/avatars/MemberPresenceAvatar.js
index e90f2e3e62..486688250e 100644
--- a/src/components/views/avatars/MemberPresenceAvatar.js
+++ b/src/components/views/avatars/MemberPresenceAvatar.js
@@ -22,6 +22,7 @@ import MatrixClientPeg from "../../../MatrixClientPeg";
 import AccessibleButton from '../elements/AccessibleButton';
 import Presence from "../../../Presence";
 import dispatcher from "../../../dispatcher";
+import UserSettingsStore from "../../../UserSettingsStore";
 
 module.exports = React.createClass({
     displayName: 'MemberPresenceAvatar',
@@ -112,10 +113,16 @@ module.exports = React.createClass({
             <MemberAvatar member={this.props.member} width={this.props.width} height={this.props.height}
                           resizeMethod={this.props.resizeMethod}/>
         );
-        const statusNode = (
+        let statusNode = (
             <span className={"mx_MemberPresenceAvatar_status mx_MemberPresenceAvatar_status_" + this.state.status}/>
         );
 
+        // LABS: Disable presence management functions for now
+        if (!UserSettingsStore.isFeatureEnabled("feature_presence_management")) {
+            statusNode = null;
+            onClickFn = null;
+        }
+
         let avatar = (
             <div className="mx_MemberPresenceAvatar">
                 {avatarNode}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index df236636a2..1a9e59e3cd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -620,6 +620,7 @@
     "Cancel": "Cancel",
     "or": "or",
     "Message Pinning": "Message Pinning",
+    "Presence Management": "Presence Management",
     "Active call": "Active call",
     "Monday": "Monday",
     "Tuesday": "Tuesday",