diff --git a/server/src/server.ts b/server/src/server.ts
index 69dc45af..bf8b5d2e 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -367,8 +367,11 @@ function trackClientActivity(ws: RuntimeClient, packageID: number) {
     const isPingPacket = packageID === pkg.serverPacketID.ping;
 
     ws.packetCount = Number(ws.packetCount ?? 0) + 1;
+    ws.lastPacketAt = now;
 
     if (isPingPacket) {
+        ws.lastPingAt = now;
+        ws.lastActivityAt = now;
         return;
     }
 
diff --git a/server/src/types/runtime.ts b/server/src/types/runtime.ts
index a8388277..1ed7f879 100644
--- a/server/src/types/runtime.ts
+++ b/server/src/types/runtime.ts
@@ -485,6 +485,7 @@ export type RuntimeClient = {
     lastPacketIntervalMs?: number;
     minPacketIntervalMs?: number;
     lastActivityAt?: number;
+    lastPingAt?: number;
     packetTypeCounts?: Record<string, number>;
     nextMapClickAt?: number;
     nextDoorToggleAt?: number;