diff --git a/packages/rocketchat-lib/server/models/Messages.coffee b/packages/rocketchat-lib/server/models/Messages.coffee
index 7c4512f9eaa..d0d26e74be0 100644
--- a/packages/rocketchat-lib/server/models/Messages.coffee
+++ b/packages/rocketchat-lib/server/models/Messages.coffee
@@ -271,7 +271,7 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base
 
 		_.extend record, extraData
 
-		record._id = @insert record
+		record._id = @insertOrUpsert record
 		return record
 
 	createUserJoinWithRoomIdAndUser: (roomId, user, extraData) ->