diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index ffdb6a913e8..4c1ade23a48 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -700,6 +700,7 @@ const actions = {
 			&& lastMessage.systemMessage !== 'reaction_deleted'
 			&& lastMessage.systemMessage !== 'reaction_revoked'
 			&& lastMessage.systemMessage !== 'message_deleted'
+			&& lastMessage.systemMessage !== 'message_edited'
 			&& !(typeof lastMessage.id.startsWith === 'function'
 				&& lastMessage.id.startsWith('temp-')
 				&& lastMessage.message.startsWith('/'))) {
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index 906090771f5..41737d7bd02 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -547,6 +547,15 @@ const actions = {
 				context.commit('addMessage', { token, message: message.parent })
 			}
 
+			// update conversation lastMessage, if it was edited
+			if (message.systemMessage === 'message_edited'
+				&& message.parent.id === context.getters.conversation(token).lastMessage.id) {
+				context.dispatch('updateConversationLastMessage', {
+					token,
+					lastMessage: message.parent,
+				})
+			}
+
 			const reactionsStore = useReactionsStore()
 			if (message.systemMessage === 'message_deleted') {
 				reactionsStore.resetReactions(token, message.parent.id)