diff --git a/client/methods/deleteMessage.js b/client/methods/deleteMessage.js
index 2535626f637..1e5075545ae 100644
--- a/client/methods/deleteMessage.js
+++ b/client/methods/deleteMessage.js
@@ -21,7 +21,7 @@ Meteor.methods({
 			return false;
 		}
 		const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes');
-		if (!(forceDelete) || (_.isNumber(blockDeleteInMinutes) && blockDeleteInMinutes !== 0)) {
+		if (!forceDelete && (_.isNumber(blockDeleteInMinutes) && blockDeleteInMinutes !== 0)) {
 			if (message.ts) {
 				const msgTs = moment(message.ts);
 				if (msgTs) {
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 8e1fb529bc3..771c3b65025 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -188,7 +188,9 @@ Meteor.startup(function() {
 				return;
 			}
 			const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes');
-			if ((blockDeleteInMinutes != null && blockDeleteInMinutes !== 0) || !(forceDelete)) {
+			if (forceDelete) {
+				return true;
+			} else if ((blockDeleteInMinutes != null && blockDeleteInMinutes !== 0)) {
 				let msgTs;
 				if (message.ts != null) {
 					msgTs = moment(message.ts);
diff --git a/packages/rocketchat-lib/server/methods/deleteMessage.js b/packages/rocketchat-lib/server/methods/deleteMessage.js
index e4b6e306040..877f0229566 100644
--- a/packages/rocketchat-lib/server/methods/deleteMessage.js
+++ b/packages/rocketchat-lib/server/methods/deleteMessage.js
@@ -35,7 +35,7 @@ Meteor.methods({
 			});
 		}
 		const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes');
-		if ((blockDeleteInMinutes != null && blockDeleteInMinutes !== 0) || !(forceDelete)) {
+		if ((blockDeleteInMinutes != null && blockDeleteInMinutes !== 0) && !(forceDelete)) {
 			if (originalMessage.ts == null) {
 				return;
 			}