diff --git a/server/methods/updateMessage.coffee b/server/methods/updateMessage.coffee
index c2b12ebd8a736..da324fd2a2296 100644
--- a/server/methods/updateMessage.coffee
+++ b/server/methods/updateMessage.coffee
@@ -30,8 +30,11 @@ Meteor.methods
 
 		message = RocketChat.callbacks.run 'beforeSaveMessage', message
 
+		tempid = message._id
+		delete message._id
+
 		ChatMessage.update
-			_id: message._id
+			_id: tempid
 			'u._id': Meteor.userId()
 		,
 			$set: message