diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts
index d0f5d9e3c..de1fd03ff 100644
--- a/packages/hydrooj/src/service/server.ts
+++ b/packages/hydrooj/src/service/server.ts
@@ -388,9 +388,9 @@ export function Connection(
                 if (Date.now() - lastHeartbeat > 40000) conn.close(4000, 'Heartbeat timeout');
             }, 40000);
             conn.onmessage = (e) => {
+                lastHeartbeat = Date.now();
                 if (e.data === 'ping') {
                     conn.send('pong');
-                    lastHeartbeat = Date.now();
                     return;
                 }
                 h.message?.(JSON.parse(e.data.toString()));