diff --git a/src/MQTTAsyncUtils.c b/src/MQTTAsyncUtils.c
index b543f9f7..f325acac 100644
--- a/src/MQTTAsyncUtils.c
+++ b/src/MQTTAsyncUtils.c
@@ -2329,6 +2329,7 @@ static void MQTTAsync_closeOnly(Clients* client, enum MQTTReasonCodes reasonCode
 	FUNC_ENTRY;
 	client->good = 0;
 	client->ping_outstanding = 0;
+	client->ping_due = 0;
 	if (client->net.socket > 0)
 	{
 		MQTTProtocol_checkPendingWrites();
diff --git a/src/MQTTClient.c b/src/MQTTClient.c
index 2c6f2fdd..b32a35ed 100644
--- a/src/MQTTClient.c
+++ b/src/MQTTClient.c
@@ -1064,6 +1064,7 @@ static void MQTTClient_closeSession(Clients* client, enum MQTTReasonCodes reason
 	FUNC_ENTRY;
 	client->good = 0;
 	client->ping_outstanding = 0;
+	client->ping_due = 0;
 	if (client->net.socket > 0)
 	{
 		if (client->connected)