diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index 95f69899946..5bd18be6188 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -673,6 +673,11 @@ const actions = {
 		}
 
 		const conversation = Object.assign({}, getters.conversations[token])
+		if (conversation.lastMessage.id === parseInt(messageId, 10)
+			|| conversation.lastMessage.timestamp >= Date.parse(notification.datetime) / 1000) {
+			// Already updated from other source, skipping
+			return
+		}
 
 		const actor = notification.subjectRichParameters.user || notification.subjectRichParameters.guest || {
 			type: 'guest',