diff --git a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
index a767c1da..69c6c634 100644
--- a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
@@ -174,7 +174,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                 publisher.forwardMessage(message, mForwardUrl);
             }
 
-            if(!StringUtil.isNullOrEmpty(mMentionForwardUrl) && message.hasContent() && message.getContent().getMentionedType() != 0) {
+            if(!StringUtil.isNullOrEmpty(mMentionForwardUrl) && message.hasContent() && message.getContent().getMentionedType() != 0 && !(isAdmin && mNoForwardAdminMessage)) {
                 publisher.forwardMessage(message, mMentionForwardUrl);
             }