diff --git a/server/alertManager.js b/server/alertManager.js
index c94091f59..fae30fb10 100644
--- a/server/alertManager.js
+++ b/server/alertManager.js
@@ -1173,7 +1173,7 @@ class AlertManager extends EventEmitter {
                         </tr>
                         <tr>
                             <td style="padding: 8px 0; font-weight: bold; color: #374151;">Time:</td>
-                            <td style="padding: 8px 0; color: #6b7280;">${new Date(alert.timestamp).toLocaleString()}</td>
+                            <td style="padding: 8px 0; color: #6b7280;">${new Date(alert.triggeredAt || alert.lastUpdate || Date.now()).toLocaleString()}</td>
                         </tr>
                     </table>
                 </div>
@@ -1200,7 +1200,7 @@ Metric: ${alert.rule.metric.toUpperCase()}
 Current Value: ${alert.value}%
 Threshold: ${alert.threshold}%
 Status: ${alert.guest.status}
-Time: ${new Date(alert.timestamp).toLocaleString()}
+Time: ${new Date(alert.triggeredAt || alert.lastUpdate || Date.now()).toLocaleString()}
 
 Description: ${alert.rule.description}
 
@@ -1296,7 +1296,7 @@ This alert was generated by Pulse monitoring system.
                 footer: {
                     text: 'Pulse Monitoring System'
                 },
-                timestamp: new Date(alert.timestamp).toISOString()
+                timestamp: new Date(alert.triggeredAt || alert.lastUpdate || Date.now()).toISOString()
             }],
             // Slack compatible format
             text: `${severityEmoji[alert.rule.severity] || '📢'} *${alert.rule.name}*`,
@@ -1321,7 +1321,7 @@ This alert was generated by Pulse monitoring system.
                     }
                 ],
                 footer: 'Pulse Monitoring',
-                ts: Math.floor(alert.timestamp / 1000)
+                ts: Math.floor((alert.triggeredAt || alert.lastUpdate || Date.now()) / 1000)
             }]
         };