diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index f9d0a9cda8..b274e6a594 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -30,6 +30,10 @@ const FEATURES = [
         id: 'feature_groups',
         name: _td("Groups"),
     },
+    {
+        id: 'feature_pinning',
+        name: _td("Message Pinning"),
+    },
 ];
 
 export default {
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 59d8937aa6..4df0ff738c 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -31,6 +31,7 @@ import linkifyMatrix from '../../../linkify-matrix';
 import AccessibleButton from '../elements/AccessibleButton';
 import ManageIntegsButton from '../elements/ManageIntegsButton';
 import {CancelButton} from './SimpleRoomHeader';
+import UserSettingsStore from "../../../UserSettingsStore";
 
 linkifyMatrix(linkify);
 
@@ -300,7 +301,7 @@ module.exports = React.createClass({
                 </AccessibleButton>;
         }
 
-        if (this.props.onPinnedClick) {
+        if (this.props.onPinnedClick && UserSettingsStore.isFeatureEnabled('feature_pinning')) {
             pinnedEventsButton =
                 <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onPinnedClick} title={_t("Pinned Messages")}>
                     <TintableSvg src="img/icons-pin.svg" width="16" height="16" />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 95a8fcdd58..86ad0631e2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -618,6 +618,7 @@
     "(~%(count)s results)|other": "(~%(count)s results)",
     "Cancel": "Cancel",
     "or": "or",
+    "Message Pinning": "Message Pinning",
     "Active call": "Active call",
     "Monday": "Monday",
     "Tuesday": "Tuesday",