diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index 0b803d8f292..fe3d1064a58 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -1,5 +1,7 @@
 Meteor.methods
 	sendMessage: (message) ->
+		if message.msg?.length > RocketChat.settings.get('Message_MaxAllowedSize')
+			throw new Meteor.Error 400, '[methods] sendMessage -> Message size exceed Message_MaxAllowedSize'
 
 		if not Meteor.userId()
 			throw new Meteor.Error('invalid-user', "[methods] sendMessage -> Invalid user")