diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 6962d2c08d..2f0ee5e47d 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -335,7 +335,7 @@ export default React.createClass({
             <div className='mx_MatrixChat_wrapper'>
                 { topBar }
                 <div className={bodyClasses}>
-                    <TagPanel />
+                    { SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> }
                     <LeftPanel
                         selectedRoom={this.props.currentRoomId}
                         collapsed={this.props.collapseLhs || false}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index bbd92abf01..07de17ccfd 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -88,6 +88,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_tag_panel": {
+        isFeature: true,
+        displayName: _td("Tag Panel"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),