diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java
index 401a1222..7c9cddf8 100644
--- a/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java
@@ -151,7 +151,7 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
             return;
         }
 
-        if (msg.getClientID() == null || msg.getClientID().length() > 23 || msg.getClientID().length() == 0) {
+        if (msg.getClientID() == null || msg.getClientID().length() == 0) {
             ConnAckMessage okResp = new ConnAckMessage();
             okResp.setReturnCode(ConnAckMessage.IDENTIFIER_REJECTED);
             session.write(okResp);
diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java
index 9713b0b4..ae9f1959 100644
--- a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java
+++ b/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java
@@ -186,7 +186,7 @@ public class ProtocolProcessorTest {
         m_processor.processConnect(m_session, connMsg);
 
         //Verify
-        assertEquals(ConnAckMessage.IDENTIFIER_REJECTED, m_returnCode);
+        assertEquals(ConnAckMessage.CONNECTION_ACCEPTED, m_returnCode);
     }
 
     @Test