diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
index ea1c0670..7cca4008 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
@@ -150,20 +150,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
         if (evt instanceof ProtocolEvent) {
             ServerChannel session = ((ProtocolEvent) evt).getSession();
             AbstractMessage message = ((ProtocolEvent) evt).getMessage();
-            if (message instanceof ConnectMessage ||
-                message instanceof UnsubscribeMessage ||
-                message instanceof SubscribeMessage ||
-                message instanceof PubRelMessage ||
-                message instanceof PubRecMessage ||
-                message instanceof PubCompMessage ||
-                message instanceof PubAckMessage ||
-                message instanceof DisconnectMessage ||
-                message instanceof PublishMessage) {
-                annotationSupport.dispatch(session, message);
-            } else {
-                throw new RuntimeException("Illegal message received " + message);
-            }
-
+            annotationSupport.dispatch(session, message);
         }
     }