diff --git a/lib/Federation/Proxy/TalkV1/Controller/ChatController.php b/lib/Federation/Proxy/TalkV1/Controller/ChatController.php
index a50db1eee73..38902f4502b 100644
--- a/lib/Federation/Proxy/TalkV1/Controller/ChatController.php
+++ b/lib/Federation/Proxy/TalkV1/Controller/ChatController.php
@@ -171,6 +171,7 @@ public function receiveMessages(
 		$data = $this->proxy->getOCSData($proxy);
 		/** @var TalkChatMessageWithParent[] $data */
 		$data = $this->userConverter->convertAttendees($room, $data, 'actorType', 'actorId', 'actorDisplayName');
+		$data = $this->userConverter->convertAttendees($room, $data, 'lastEditActorType', 'lastEditActorId', 'lastEditActorDisplayName');
 
 		return new DataResponse($data, Http::STATUS_OK, $headers);
 	}
@@ -212,6 +213,7 @@ public function getMessageContext(Room $room, Participant $participant, int $mes
 		$data = $this->proxy->getOCSData($proxy);
 		/** @var TalkChatMessageWithParent[] $data */
 		$data = $this->userConverter->convertAttendees($room, $data, 'actorType', 'actorId', 'actorDisplayName');
+		$data = $this->userConverter->convertAttendees($room, $data, 'lastEditActorType', 'lastEditActorId', 'lastEditActorDisplayName');
 
 		return new DataResponse($data, Http::STATUS_OK, $headers);
 	}
@@ -259,6 +261,7 @@ public function editMessage(Room $room, Participant $participant, int $messageId
 		$data = $this->proxy->getOCSData($proxy, [Http::STATUS_OK, Http::STATUS_ACCEPTED]);
 		if (!empty($data)) {
 			$data = $this->userConverter->convertAttendee($room, $data, 'actorType', 'actorId', 'actorDisplayName');
+			$data = $this->userConverter->convertAttendee($room, $data, 'lastEditActorType', 'lastEditActorId', 'lastEditActorDisplayName');
 		} else {
 			$data = null;
 		}
@@ -315,6 +318,7 @@ public function deleteMessage(Room $room, Participant $participant, int $message
 		$data = $this->proxy->getOCSData($proxy, [Http::STATUS_OK, Http::STATUS_ACCEPTED]);
 		if (!empty($data)) {
 			$data = $this->userConverter->convertAttendee($room, $data, 'actorType', 'actorId', 'actorDisplayName');
+			$data = $this->userConverter->convertAttendee($room, $data, 'lastEditActorType', 'lastEditActorId', 'lastEditActorDisplayName');
 		} else {
 			$data = null;
 		}