diff --git a/src/qml/Component/Timeline/MessageDelegate.qml b/src/qml/Component/Timeline/MessageDelegate.qml
index bd6e22dd0..d69f9b40b 100644
--- a/src/qml/Component/Timeline/MessageDelegate.qml
+++ b/src/qml/Component/Timeline/MessageDelegate.qml
@@ -24,10 +24,13 @@ TimelineContainer {
             visible: currentRoom.chatBoxEditId !== model.eventId
             isEmote: messageDelegate.isEmote
         }
-        MessageEditComponent {
+        Loader {
             Layout.fillWidth: true
-            messageId: model.eventId
             visible: currentRoom.chatBoxEditId === model.eventId
+            active: visible
+            sourceComponent: MessageEditComponent {
+                messageId: model.eventId
+            }
         }
         LinkPreviewDelegate {
             Layout.fillWidth: true