diff --git a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
index 2b0c651c..05c7d1db 100644
--- a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
@@ -108,7 +108,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             }
 
 
-            if (!isAdmin && message.getContent().getType() == Text) {
+            if (!isAdmin) {
                 Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
                 if (matched != null && !matched.isEmpty()) {
                     m_messagesStore.storeSensitiveMessage(message);