diff --git a/src/app/qml/NeochatMaximizeComponent.qml b/src/app/qml/NeochatMaximizeComponent.qml
index e97b218fa..645d6917a 100644
--- a/src/app/qml/NeochatMaximizeComponent.qml
+++ b/src/app/qml/NeochatMaximizeComponent.qml
@@ -120,7 +120,7 @@ Components.AlbumMaximizeComponent {
 
     onOpened: forceActiveFocus()
 
-    onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom, root.currentAuthor)
+    onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom)
 
     onSaveItem: {
         var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);
diff --git a/src/app/roommanager.cpp b/src/app/roommanager.cpp
index f748a64c5..7fab42719 100644
--- a/src/app/roommanager.cpp
+++ b/src/app/roommanager.cpp
@@ -266,7 +266,7 @@ void RoomManager::viewEventSource(const QString &eventId)
     Q_EMIT showEventSource(eventId);
 }
 
-void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText, const QString &hoveredLink)
+void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText, const QString &hoveredLink)
 {
     if (eventId.isEmpty()) {
         qWarning() << "Tried to open event menu with empty event id";
@@ -280,7 +280,7 @@ void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, Neoch
     }
     const auto &event = **it;
     Q_EMIT showDelegateMenu(eventId,
-                            sender,
+                            room->qmlSafeMember(event.senderId()),
                             MessageComponentType::typeForEvent(event),
                             EventHandler::plainBody(room, &event),
                             EventHandler::richBody(room, &event),
diff --git a/src/app/roommanager.h b/src/app/roommanager.h
index 29e61c2d2..83cd60854 100644
--- a/src/app/roommanager.h
+++ b/src/app/roommanager.h
@@ -222,8 +222,7 @@ public:
     /**
      * @brief Show a context menu for the given event.
      */
-    Q_INVOKABLE void
-    viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText = {}, const QString &hoveredLink = {});
+    Q_INVOKABLE void viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText = {}, const QString &hoveredLink = {});
 
     /**
      * @brief Set a URL to be loaded as the initial room.
diff --git a/src/messagecontent/CodeComponent.qml b/src/messagecontent/CodeComponent.qml
index 5b22942c0..77c53234e 100644
--- a/src/messagecontent/CodeComponent.qml
+++ b/src/messagecontent/CodeComponent.qml
@@ -129,7 +129,7 @@ QQC2.Control {
 
             TapHandler {
                 acceptedDevices: PointerDevice.TouchScreen
-                onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink);
+                onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
             }
 
             background: null
diff --git a/src/messagecontent/QuoteComponent.qml b/src/messagecontent/QuoteComponent.qml
index 562798fda..cd0cfc72b 100644
--- a/src/messagecontent/QuoteComponent.qml
+++ b/src/messagecontent/QuoteComponent.qml
@@ -63,7 +63,7 @@ QQC2.Control {
             enabled: !quoteText.hoveredLink
             acceptedDevices: PointerDevice.TouchScreen
             acceptedButtons: Qt.LeftButton
-            onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink);
+            onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
         }
     }
 
diff --git a/src/messagecontent/TextComponent.qml b/src/messagecontent/TextComponent.qml
index cfe592383..0dc0b74cb 100644
--- a/src/messagecontent/TextComponent.qml
+++ b/src/messagecontent/TextComponent.qml
@@ -95,12 +95,12 @@ TextEdit {
         enabled: !root.hoveredLink
         acceptedButtons: Qt.LeftButton
         acceptedDevices: PointerDevice.TouchScreen
-        onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink);
+        onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
     }
     TapHandler {
         acceptedButtons: Qt.RightButton
         acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad | PointerDevice.Stylus
         gesturePolicy: TapHandler.WithinBounds
-        onTapped: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink);
+        onTapped: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
     }
 }
diff --git a/src/timeline/HiddenDelegate.qml b/src/timeline/HiddenDelegate.qml
index 6cca3cd93..1365658a5 100644
--- a/src/timeline/HiddenDelegate.qml
+++ b/src/timeline/HiddenDelegate.qml
@@ -93,7 +93,7 @@ TimelineDelegate {
     QtObject {
         id: _private
         function showMessageMenu() {
-            RoomManager.viewEventMenu(root.eventId, root.room, root.author, "");
+            RoomManager.viewEventMenu(root.eventId, root.room, "");
         }
     }
 }
diff --git a/src/timeline/MessageDelegate.qml b/src/timeline/MessageDelegate.qml
index 49260c6dc..046102e01 100644
--- a/src/timeline/MessageDelegate.qml
+++ b/src/timeline/MessageDelegate.qml
@@ -224,7 +224,7 @@ MessageDelegateBase {
         id: _private
 
         function showMessageMenu() {
-            RoomManager.viewEventMenu(root.eventId, root.room, root.author, root.Message.selectedText, root.Message.hoveredLink);
+            RoomManager.viewEventMenu(root.eventId, root.room, root.Message.selectedText, root.Message.hoveredLink);
         }
     }
 }