diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 8352872a2d..6713d41574 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -576,6 +576,7 @@ module.exports = React.createClass({
         const scrollToken = mxEv.status ? undefined : eventId;
 
         const readReceipts = this._readReceiptsByEvent[eventId];
+        const editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
 
         ret.push(
             <li key={eventId}
@@ -585,7 +586,7 @@ module.exports = React.createClass({
                 <EventTile mxEvent={mxEv}
                     continuation={continuation}
                     isRedacted={mxEv.isRedacted()}
-                    replacingEventId={mxEv.replacingEventId()}
+                    replacingEventId={editingEnabled && mxEv.replacingEventId()}
                     editState={isEditing && this.props.editState}
                     onHeightChanged={this._onHeightChanged}
                     readReceipts={readReceipts}
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 7d11ddac61..a997e7a3de 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -829,7 +829,7 @@ module.exports.haveTileForEvent = function(e) {
     if (e.isRedacted() && !isMessageEvent(e)) return false;
 
     // No tile for replacement events since they update the original tile
-    if (e.isRelation("m.replace")) return false;
+    if (e.isRelation("m.replace") && SettingsStore.isFeatureEnabled("feature_message_editing")) return false;
 
     const handler = getHandlerTile(e);
     if (handler === undefined) return false;
diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
index 5ecb91b305..d82647dbdf 100644
--- a/src/shouldHideEvent.js
+++ b/src/shouldHideEvent.js
@@ -47,7 +47,7 @@ export default function shouldHideEvent(ev) {
     if (ev.isRedacted() && !isEnabled('showRedactions')) return true;
 
     // Hide replacement events since they update the original tile
-    if (ev.isRelation("m.replace")) return true;
+    if (ev.isRelation("m.replace") && SettingsStore.isFeatureEnabled("feature_message_editing")) return true;
 
     const eventDiff = memberEventDiff(ev);