diff --git a/server.py b/server.py
index 6c94743..fb027ff 100644
--- a/server.py
+++ b/server.py
@@ -306,6 +306,8 @@ def session(connection, client, ip, isssl=False):
             print("Received data: {}".format(data))
             try:
                 textt += data.decode()
+                if not property_list[pending]["ping_pending"]:
+                    property_list[pending]["last_ping"] = time.time()
                 #if pending != "*":
                 #    if (time.time() - last_ping) > 30 and not ping_pending:
                 #        print(f"Sending ping msg to {pending}")