diff --git a/app/Models/YnhServer.php b/app/Models/YnhServer.php
index 044c032..ef8a692 100644
--- a/app/Models/YnhServer.php
+++ b/app/Models/YnhServer.php
@@ -156,10 +156,10 @@ public function domain(): ?YnhDomain
     public function lastHeartbeat(): ?Carbon
     {
         $minDate = Carbon::now()->subMinutes(30);
-        $heartbeat = YnhOsquery::select(['calendar_time'])
+        $heartbeat = YnhOsquery::select(['updated_at'])
             ->where('ynh_server_id', $this->id)
-            ->where('calendar_time', '>=', $minDate->toDateTimeString())
-            ->orderBy('calendar_time', 'desc')
+            ->where('updated_at', '>=', $minDate->toDateTimeString())
+            ->orderBy('updated_at', 'desc')
             ->first();
         return $heartbeat?->calendar_time;
     }