diff --git a/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp b/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp
index dd351ae..d5b9fd0 100644
--- a/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp
+++ b/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp
@@ -84,6 +84,7 @@ void MQTTGWConnectionHandler::handlePingresp(Client* client, MQTTGWPacket* packe
 	snPacket->setPINGRESP();
 	Event* ev1 = new Event();
 	ev1->setClientSendEvent(client, snPacket);
+	client->updateStatus(snPacket);
 	_gateway->getClientSendQue()->post(ev1);
 }
 
diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
index 83614cf..4dda1d0 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
@@ -174,10 +174,10 @@ void ClientRecvTask::log(Client* client, MQTTSNPacket* packet, MQTTSNString* id)
 	switch (packet->getType())
 	{
 	case MQTTSN_SEARCHGW:
-	case MQTTSN_PINGREQ:
 		WRITELOG(FORMAT_Y_G_G_NL, currentDateTime(), packet->getName(), LEFTARROW, CLIENT, packet->print(pbuf));
 		break;
 	case MQTTSN_CONNECT:
+	case MQTTSN_PINGREQ:
 		WRITELOG(FORMAT_Y_G_G_NL, currentDateTime(), packet->getName(), LEFTARROW, clientId, packet->print(pbuf));
 		break;
 	case MQTTSN_DISCONNECT:
diff --git a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
index 62010e1..68c01bc 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
@@ -91,7 +91,6 @@ void ClientSendTask::log(Client* client, MQTTSNPacket* packet)
 	{
 	case MQTTSN_ADVERTISE:
 	case MQTTSN_GWINFO:
-	case MQTTSN_PINGRESP:
 		WRITELOG(FORMAT_Y_W_G, currentDateTime(), packet->getName(), RIGHTARROW, CLIENTS, packet->print(pbuf));
 		break;
 	case MQTTSN_CONNACK:
@@ -100,6 +99,7 @@ void ClientSendTask::log(Client* client, MQTTSNPacket* packet)
 	case MQTTSN_WILLMSGREQ:
 	case MQTTSN_WILLTOPICRESP:
 	case MQTTSN_WILLMSGRESP:
+	case MQTTSN_PINGRESP:
 		WRITELOG(FORMAT_Y_W_G, currentDateTime(), packet->getName(), RIGHTARROW, clientId, packet->print(pbuf));
 		break;
 	case MQTTSN_REGISTER: