diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
index 7ca2929..c44d95b 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
@@ -192,8 +192,11 @@ void ClientRecvTask::run()
 				{
                     if ( client )
                     {
-                        /* Client exists. Set SensorNet Address of it. */
-                        client->setClientAddress(senderAddr);
+                        /* Client exists. Set SensorNet Address of it, if Client is not secure one. */
+                    	if ( !client->isSecureNetwork() )
+                    	{
+                    		client->setClientAddress(senderAddr);
+                    	}
                     }
                     else
                     {