diff --git a/src/qml/MessageDelegateContextMenu.qml b/src/qml/MessageDelegateContextMenu.qml
index 25a65f654..42695e8af 100644
--- a/src/qml/MessageDelegateContextMenu.qml
+++ b/src/qml/MessageDelegateContextMenu.qml
@@ -39,8 +39,9 @@ DelegateContextMenu {
             onTriggered: {
                 currentRoom.editCache.editId = eventId;
                 currentRoom.mainCache.replyId = "";
+                currentRoom.mainCache.threadId = "";
             }
-            visible: author.isLocalMember && (root.messageComponentType === MessageComponentType.Emote || root.messageComponentType === MessageComponentType.Message)
+            visible: root.author.isLocalMember && root.messageComponentType === MessageComponentType.Text
         },
         DelegateContextMenu.ReplyMessageAction {},
         Kirigami.Action {