diff --git a/apps/backoffice/app/api/jobs/stream/route.ts b/apps/backoffice/app/api/jobs/stream/route.ts
index caec1fc..e31e459 100644
--- a/apps/backoffice/app/api/jobs/stream/route.ts
+++ b/apps/backoffice/app/api/jobs/stream/route.ts
@@ -12,6 +12,17 @@ export async function GET(request: NextRequest) {
       let isActive = true;
       let consecutiveErrors = 0;
       let intervalId: ReturnType<typeof setInterval> | null = null;
+      let heartbeatId: ReturnType<typeof setInterval> | null = null;
+
+      const send = (msg: string): boolean => {
+        try {
+          controller.enqueue(new TextEncoder().encode(msg));
+          return true;
+        } catch {
+          isActive = false;
+          return false;
+        }
+      };
 
       const fetchJobs = async () => {
         if (!isActive) return;
@@ -26,23 +37,17 @@ export async function GET(request: NextRequest) {
             const data = await response.json();
             const dataStr = JSON.stringify(data);
 
-            // Send only if data changed
-            if (dataStr !== lastData && isActive) {
+            // Always send data (client needs fresh timestamps for active jobs)
+            if (isActive) {
               lastData = dataStr;
-              try {
-                controller.enqueue(
-                  new TextEncoder().encode(`data: ${dataStr}\n\n`)
-                );
-              } catch {
-                isActive = false;
-              }
+              send(`data: ${dataStr}\n\n`);
             }
 
-            // Adapt interval: 2s when active jobs exist, 15s when idle
+            // Adapt interval: 2s when active jobs exist, 10s when idle
             const hasActiveJobs = data.some((j: { status: string }) =>
               j.status === "running" || j.status === "pending" || j.status === "extracting_pages" || j.status === "generating_thumbnails"
             );
-            const nextInterval = hasActiveJobs ? 2000 : 15000;
+            const nextInterval = hasActiveJobs ? 2000 : 10000;
             restartInterval(nextInterval);
           }
         } catch (error) {
@@ -60,6 +65,11 @@ export async function GET(request: NextRequest) {
         intervalId = setInterval(fetchJobs, ms);
       };
 
+      // Heartbeat every 15s to keep connection alive
+      heartbeatId = setInterval(() => {
+        if (isActive) send(": heartbeat\n\n");
+      }, 15000);
+
       // Initial fetch + start polling
       await fetchJobs();
 
@@ -67,6 +77,7 @@ export async function GET(request: NextRequest) {
       request.signal.addEventListener("abort", () => {
         isActive = false;
         if (intervalId !== null) clearInterval(intervalId);
+        if (heartbeatId !== null) clearInterval(heartbeatId);
         controller.close();
       });
     },
diff --git a/apps/backoffice/app/components/JobsIndicator.tsx b/apps/backoffice/app/components/JobsIndicator.tsx
index 45ffe1e..5911667 100644
--- a/apps/backoffice/app/components/JobsIndicator.tsx
+++ b/apps/backoffice/app/components/JobsIndicator.tsx
@@ -56,14 +56,27 @@ export function JobsIndicator() {
   useEffect(() => {
     let eventSource: EventSource | null = null;
     let reconnectTimeout: ReturnType<typeof setTimeout> | null = null;
+    let staleTimeout: ReturnType<typeof setTimeout> | null = null;
+
+    const resetStaleTimer = () => {
+      if (staleTimeout) clearTimeout(staleTimeout);
+      // If no message received in 30s, reconnect (heartbeat should come every 15s)
+      staleTimeout = setTimeout(() => {
+        eventSource?.close();
+        eventSource = null;
+        connect();
+      }, 30000);
+    };
 
     const connect = () => {
       if (eventSource) {
         eventSource.close();
       }
       eventSource = new EventSource("/api/jobs/stream");
+      resetStaleTimer();
 
       eventSource.onmessage = (event) => {
+        resetStaleTimer();
         try {
           const allJobs: Job[] = JSON.parse(event.data);
           const active = allJobs.filter(j =>
@@ -79,20 +92,15 @@ export function JobsIndicator() {
       eventSource.onerror = () => {
         eventSource?.close();
         eventSource = null;
-        // Reconnect after 5s on error
-        reconnectTimeout = setTimeout(connect, 5000);
+        // Reconnect after 3s on error
+        reconnectTimeout = setTimeout(connect, 3000);
       };
     };
 
     const disconnect = () => {
-      if (reconnectTimeout) {
-        clearTimeout(reconnectTimeout);
-        reconnectTimeout = null;
-      }
-      if (eventSource) {
-        eventSource.close();
-        eventSource = null;
-      }
+      if (reconnectTimeout) { clearTimeout(reconnectTimeout); reconnectTimeout = null; }
+      if (staleTimeout) { clearTimeout(staleTimeout); staleTimeout = null; }
+      if (eventSource) { eventSource.close(); eventSource = null; }
     };
 
     const handleVisibilityChange = () => {