diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js
index 40718005139..5aa41618387 100644
--- a/client/methods/updateMessage.js
+++ b/client/methods/updateMessage.js
@@ -18,6 +18,9 @@ Meteor.methods({
 		const hasPermission = RocketChat.authz.hasAtLeastOnePermission('edit-message', message.rid);
 		const editAllowed = RocketChat.settings.get('Message_AllowEditing');
 		let editOwn = false;
+		if (originalMessage.msg === message.msg) {
+			return;
+		}
 		if (originalMessage && originalMessage.u && originalMessage.u._id) {
 			editOwn = originalMessage.u._id === Meteor.userId();
 		}
diff --git a/packages/rocketchat-lib/server/methods/updateMessage.js b/packages/rocketchat-lib/server/methods/updateMessage.js
index f2769e629ab..feb03bd6d54 100644
--- a/packages/rocketchat-lib/server/methods/updateMessage.js
+++ b/packages/rocketchat-lib/server/methods/updateMessage.js
@@ -16,7 +16,9 @@ Meteor.methods({
 		if (!originalMessage || !originalMessage._id) {
 			return;
 		}
-
+		if (originalMessage.msg === message.msg) {
+			return;
+		}
 		const hasPermission = RocketChat.authz.hasPermission(Meteor.userId(), 'edit-message', message.rid);
 		const editAllowed = RocketChat.settings.get('Message_AllowEditing');
 		const editOwn = originalMessage.u && originalMessage.u._id === Meteor.userId();