diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 61d61b8f42..f6fc8af55d 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -279,7 +279,6 @@ export default class MessageComposer extends React.Component {
             tombstone: this._getRoomTombstone(),
             canSendMessages: this.props.room.maySendMessage(),
             showCallButtons: SettingsStore.getValue("showCallButtonsInComposer"),
-            showSendButton: SettingsStore.getValue("MessageComposerInput.showSendButton"),
             hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room),
             joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room),
             isComposerEmpty: true,
@@ -298,12 +297,6 @@ export default class MessageComposer extends React.Component {
         }
     };
 
-    onShowSendButtonChanged = () => {
-        this.setState({
-            showSendButton: SettingsStore.getValue("MessageComposerInput.showSendButton"),
-        });
-    }
-
     _onWidgetUpdate = () => {
         this.setState({hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room)});
     };
@@ -316,8 +309,6 @@ export default class MessageComposer extends React.Component {
         this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
         this._waitForOwnMember();
-        this.showSendButtonRef = SettingsStore.watchSetting(
-            "MessageComposerInput.showSendButton", null, this.onShowSendButtonChanged);
     }
 
     _waitForOwnMember() {
@@ -343,7 +334,6 @@ export default class MessageComposer extends React.Component {
         WidgetStore.instance.removeListener(UPDATE_EVENT, this._onWidgetUpdate);
         ActiveWidgetStore.removeListener('update', this._onActiveWidgetUpdate);
         dis.unregister(this.dispatcherRef);
-        SettingsStore.unwatchSetting(this.showSendButtonRef);
     }
 
     _onRoomStateEvents(ev, state) {
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index eff0824d59..4d8493401e 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -34,7 +34,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'MessageComposerInput.suggestEmoji',
         'sendTypingNotifications',
         'MessageComposerInput.ctrlEnterToSend',
-        `MessageComposerInput.showSendButton`,
     ];
 
     static TIMELINE_SETTINGS = [
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 2d8385240c..b239b809fe 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -336,11 +336,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: isMac ? _td("Use Command + Enter to send a message") : _td("Use Ctrl + Enter to send a message"),
         default: false,
     },
-    "MessageComposerInput.showSendButton": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("Show send message button"),
-        default: false,
-    },
     "MessageComposerInput.autoReplaceEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Automatically replace plain text Emoji'),