diff --git a/apps/meteor/client/startup/notifications/usersNameChanged.ts b/apps/meteor/client/startup/notifications/usersNameChanged.ts
index 9815422ce96a2..a1dacf9a1945c 100644
--- a/apps/meteor/client/startup/notifications/usersNameChanged.ts
+++ b/apps/meteor/client/startup/notifications/usersNameChanged.ts
@@ -23,6 +23,20 @@ Meteor.startup(() => {
 			},
 		);
 
+		Messages.update(
+			{
+				'editedBy._id': _id,
+			},
+			{
+				$set: {
+					'editedBy.username': username,
+				},
+			},
+			{
+				multi: true,
+			},
+		);
+
 		Messages.update(
 			{
 				mentions: {