diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 21f235df54dec881a9b1801be37c087e5b06fbaa..677a80b5fea92c8655a8e4be71e63573e3257e9a 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -750,6 +750,7 @@
   "Message_AllowDeleting" : "Allow Message Deleting",
   "Message_AllowDeleting_BlockDeleteInMinutes" : "Block Message Deleting After (n) Minutes",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description" : "Enter 0 to disable blocking.",
+  "Message_AllowUnrecognizedSlashCommand" : "Allow Unrecognized Slash Commands",
   "Message_AllowEditing" : "Allow Message Editing",
   "Message_AllowEditing_BlockEditInMinutes" : "Block Message Editing After (n) Minutes",
   "Message_AllowEditing_BlockEditInMinutesDescription" : "Enter 0 to disable blocking.",
diff --git a/packages/rocketchat-lib/server/startup/settings.coffee b/packages/rocketchat-lib/server/startup/settings.coffee
index 391cf8cf7b3b9b1ff546cde319a228b30de9b653..5d651970e9b31744dcd36f0d3a51628d70607e70 100644
--- a/packages/rocketchat-lib/server/startup/settings.coffee
+++ b/packages/rocketchat-lib/server/startup/settings.coffee
@@ -167,6 +167,7 @@ RocketChat.settings.addGroup 'Message', ->
 	@add 'Message_AllowEditing_BlockEditInMinutes', 0, { type: 'int', public: true, i18nDescription: 'Message_AllowEditing_BlockEditInMinutesDescription' }
 	@add 'Message_AllowDeleting', true, { type: 'boolean', public: true }
 	@add 'Message_AllowDeleting_BlockDeleteInMinutes', 0, { type: 'int', public: true, i18nDescription: 'Message_AllowDeleting_BlockDeleteInMinutes' }
+	@add 'Message_AllowUnrecognizedSlashCommand', false, { type: 'boolean', public: true}
 	@add 'Message_AlwaysSearchRegExp', false, { type: 'boolean' }
 	@add 'Message_ShowEditedStatus', true, { type: 'boolean', public: true }
 	@add 'Message_ShowDeletedStatus', false, { type: 'boolean', public: true }
diff --git a/packages/rocketchat-ui/lib/chatMessages.coffee b/packages/rocketchat-ui/lib/chatMessages.coffee
index 2a34351f6e526ad8e03ff0beb24e12c4d6c51ea6..6335fcd4f0b97a5d0eafd33a05b0f28c2b659d61 100644
--- a/packages/rocketchat-ui/lib/chatMessages.coffee
+++ b/packages/rocketchat-ui/lib/chatMessages.coffee
@@ -186,16 +186,18 @@ class @ChatMessages
 							else
 								Meteor.call 'slashCommand', {cmd: command, params: param, msg: msgObject }
 							return
-						invalidCommandMsg =
-							_id: Random.id()
-							rid: rid
-							ts: new Date
-							msg: TAPi18n.__('No_such_command', { command: match[1] })
-							u:
-								username: "rocketbot"
-							private: true
-						ChatMessage.upsert { _id: invalidCommandMsg._id }, invalidCommandMsg
-						return
+
+						if !RocketChat.settings.get('Message_AllowUnrecognizedSlashCommand')
+							invalidCommandMsg =
+								_id: Random.id()
+								rid: rid
+								ts: new Date
+								msg: TAPi18n.__('No_such_command', { command: match[1] })
+								u:
+									username: "rocketbot"
+								private: true
+							ChatMessage.upsert { _id: invalidCommandMsg._id }, invalidCommandMsg
+							return
 
 				Meteor.call 'sendMessage', msgObject
 				done()