diff --git a/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp b/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp
index 3162f04..98d917a 100644
--- a/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp
@@ -94,6 +94,12 @@ MQTTGWPacket* MQTTSNPublishHandler::handlePublish(Client* client, MQTTSNPacket*
 	        return nullptr;
 	    }
 
+	    if ( ( qos == 0 || qos == 3 ) && msgId > 0 )
+	    {
+	        WRITELOG("%s Invalid MsgId.%s %s\n", ERRMSG_HEADER, client->getClientId(), ERRMSG_FOOTER);
+	        return nullptr;
+	    }
+
 		if( !topic && msgId && qos > 0 && qos < 3 )
 		{
 			/* Reply PubAck with INVALID_TOPIC_ID to the client */