diff --git a/MQTTSNGateway/src/MQTTGWPublishHandler.cpp b/MQTTSNGateway/src/MQTTGWPublishHandler.cpp
index 6185b92..20381f1 100644
--- a/MQTTSNGateway/src/MQTTGWPublishHandler.cpp
+++ b/MQTTSNGateway/src/MQTTGWPublishHandler.cpp
@@ -101,6 +101,7 @@ void MQTTGWPublishHandler::handlePublish(Client* client, MQTTGWPacket* packet)
             topicId.type = tp->getType();
             topicId.data.long_.len = pub.topiclen;
             topicId.data.long_.name = pub.topic;
+            topicId.data.id = tp->getTopicId();
         }
         else
         {