diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
index 19f4c77f..7c30f0f5 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
@@ -120,6 +120,12 @@ public class ConnectDecoder extends DemuxDecoder {
 
         //Connection flag
         byte connFlags = in.readByte();
+        if (message.getProcotolVersion() == VERSION_3_1_1) { 
+            if ((connFlags & 0x01) != 0) { //bit(0) of connection flags is != 0
+                throw new CorruptedFrameException("Received a CONNECT with connectionFlags[0(bit)] != 0");
+            }
+        }
+        
         boolean cleanSession = ((connFlags & 0x02) >> 1) == 1 ? true : false;
         boolean willFlag = ((connFlags & 0x04) >> 2) == 1 ? true : false;
         byte willQos = (byte) ((connFlags & 0x18) >> 3);
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java
index 624d1074..75c79abf 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java
@@ -108,6 +108,22 @@ public class ConnectDecoderTest {
         m_msgdec.decode(this.attrMap, m_buff, results);
     }
     
+    @Test(expected = CorruptedFrameException.class)
+    public void testConnectFlags_311_withNot0Reserved() throws UnsupportedEncodingException {
+        m_buff = Unpooled.buffer(12);
+        initBaseHeader311_withFixedFlags(m_buff, (byte) 0, (byte) 0xCF); // sets the bit(0) = 1
+        List<Object> results = new ArrayList<Object>();
+        
+        //Excercise
+        m_msgdec.decode(this.attrMap, m_buff, results);
+        
+        //Verify
+        assertFalse(results.isEmpty());
+        verifyBaseHeader311((ConnectMessage)results.get(0));
+        Attribute<Integer> attr = this.attrMap.attr(MQTTDecoder.PROTOCOL_VERSION);
+        assertEquals(VERSION_3_1_1, attr.get().intValue());
+    }
+    
     @Test
     public void testBaseHeader_ClientID() throws UnsupportedEncodingException, Exception {
         m_buff = Unpooled.buffer(40);
@@ -196,13 +212,17 @@ public class ConnectDecoderTest {
     }
     
     private void initBaseHeader311_withFixedFlags(ByteBuf buff, byte fixedFlags) throws UnsupportedEncodingException {
+        initBaseHeader311_withFixedFlags(buff, fixedFlags, (byte) 0xCE);
+    }
+    
+    private void initBaseHeader311_withFixedFlags(ByteBuf buff, byte fixedFlags, byte connectFlags) throws UnsupportedEncodingException {
         buff.clear().writeByte((byte)(AbstractMessage.CONNECT << 4) | fixedFlags).writeByte((byte)0x0A);
         //Proto name
         encodeString(buff, "MQTT");
         //version
         buff.writeByte(VERSION_3_1_1);
         //conn flags
-        buff.writeByte(0xCE);
+        buff.writeByte(connectFlags);
         //keepAlive
         buff.writeBytes(new byte[]{(byte)0, (byte) 0x0A});
     }