diff --git a/server/alertManager.js b/server/alertManager.js
index 05b4f58c9..c94091f59 100644
--- a/server/alertManager.js
+++ b/server/alertManager.js
@@ -1234,7 +1234,7 @@ This alert was generated by Pulse monitoring system.
         };
 
         const payload = {
-            timestamp: new Date(alert.timestamp).toISOString(),
+            timestamp: new Date(alert.triggeredAt || alert.lastUpdate || Date.now()).toISOString(),
             alert: {
                 id: alert.id,
                 rule: {
diff --git a/src/public/js/utils.js b/src/public/js/utils.js
index 8c5d95bf0..4e2f684e6 100644
--- a/src/public/js/utils.js
+++ b/src/public/js/utils.js
@@ -299,8 +299,8 @@ PulseApp.utils = (() => {
         // Execute the update function
         updateFn();
 
-        // Restore scroll positions after a microtask to ensure DOM is updated
-        Promise.resolve().then(() => {
+        // Restore scroll positions after DOM updates are complete
+        requestAnimationFrame(() => {
             element.scrollLeft = scrollLeft;
             element.scrollTop = scrollTop;
         });