diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 0f98e6b526..ff46f7423e 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -329,6 +329,11 @@ export default class MessageComposer extends React.Component {
                 }
             }
 
+            let stickerpickerButton;
+            if (SettingsStore.isFeatureEnabled('feature_sticker_messages')) {
+                stickerpickerButton = <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />;
+            }
+
             controls.push(
                 <MessageComposerInput
                     ref={(c) => this.messageComposerInput = c}
@@ -340,7 +345,7 @@ export default class MessageComposer extends React.Component {
                     onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
                 formattingButton,
-                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
+                stickerpickerButton,
                 uploadButton,
                 hangupButton,
                 callButton,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 50008c3202..8aac4e60d0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -257,6 +257,7 @@
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
     "Stickerpack": "Stickerpack",
+    "Sticker Messages": "Sticker Messages",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Click": "Click",
     "here": "here",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index cd37c00fa8..7acaa8009f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -100,6 +100,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_sticker_messages": {
+        isFeature: true,
+        displayName: _td("Sticker Messages"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),