diff --git a/frontend/src/hooks/useBuildLogStream.ts b/frontend/src/hooks/useBuildLogStream.ts
index 1d76a664..cf06c6d2 100644
--- a/frontend/src/hooks/useBuildLogStream.ts
+++ b/frontend/src/hooks/useBuildLogStream.ts
@@ -17,8 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+import type { QueryClient } from "@tanstack/react-query";
 import { useQueryClient } from "@tanstack/react-query";
 import { buildEventStreamUrl } from "hooks/useEventStream";
+import { useNotification } from "hooks/useNotification";
 import type { LogRecord } from "models/LogRecord";
 import type { RepositoryId } from "models/RepositoryId";
 import { useEffect } from "react";
@@ -34,14 +36,38 @@ function appendLogRecord(existing: LogRecord[] | undefined, record: LogRecord):
     return [...existing ?? [], record];
 }
 
+function invalidateLogs(queryClient: QueryClient, repository: RepositoryId, packageBase: string): void {
+    void queryClient.invalidateQueries({ queryKey: ["logs", repository.key, packageBase] });
+}
+
 export function useBuildLogStream(packageBase: string, repository: RepositoryId): void {
     const queryClient = useQueryClient();
+    const { showError } = useNotification();
 
     useEffect(() => {
         const source = new EventSource(buildEventStreamUrl(repository, ["build-log"], packageBase));
+        let needsRefresh = false;
+
+        source.addEventListener("error", () => {
+            needsRefresh = true;
+        });
+
+        source.addEventListener("open", () => {
+            if (needsRefresh) {
+                invalidateLogs(queryClient, repository, packageBase);
+                needsRefresh = false;
+            }
+        });
 
         source.addEventListener("build-log", (event: MessageEvent<string>) => {
-            const data = JSON.parse(event.data) as BuildLogEvent;
+            let data: BuildLogEvent;
+            try {
+                data = JSON.parse(event.data) as BuildLogEvent;
+            } catch {
+                showError("Live updates failed", "Could not parse build log event; refreshing logs.");
+                invalidateLogs(queryClient, repository, packageBase);
+                return;
+            }
 
             const record: LogRecord = {
                 created: data.created,
@@ -66,5 +92,5 @@ export function useBuildLogStream(packageBase: string, repository: RepositoryId)
         return () => {
             source.close();
         };
-    }, [queryClient, packageBase, repository]);
+    }, [queryClient, packageBase, repository, showError]);
 }
diff --git a/frontend/src/hooks/useEventStream.ts b/frontend/src/hooks/useEventStream.ts
index 092634e4..6748cb8f 100644
--- a/frontend/src/hooks/useEventStream.ts
+++ b/frontend/src/hooks/useEventStream.ts
@@ -18,6 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import type { QueryClient } from "@tanstack/react-query";
+import { useNotification } from "hooks/useNotification";
 import type { RepositoryId } from "models/RepositoryId";
 import { useEffect } from "react";
 
@@ -62,6 +63,12 @@ function invalidateForEvent(
     }
 }
 
+function invalidateRepository(queryClient: QueryClient, repositoryKey: string): void {
+    void queryClient.invalidateQueries({ queryKey: ["packages", repositoryKey] });
+    void queryClient.invalidateQueries({ queryKey: ["status", repositoryKey] });
+    void queryClient.invalidateQueries({ queryKey: ["events", repositoryKey] });
+}
+
 export function buildEventStreamUrl(
     repository: RepositoryId,
     events?: readonly string[],
@@ -80,22 +87,41 @@ export function buildEventStreamUrl(
 }
 
 export function useEventStream(queryClient: QueryClient, repository: RepositoryId | null): void {
+    const { showError } = useNotification();
+
     useEffect(() => {
         if (!repository) {
             return;
         }
 
         const source = new EventSource(buildEventStreamUrl(repository, GLOBAL_EVENT_TYPES));
+        let needsRefresh = false;
+
+        source.addEventListener("error", () => {
+            needsRefresh = true;
+        });
+
+        source.addEventListener("open", () => {
+            if (needsRefresh) {
+                invalidateRepository(queryClient, repository.key);
+                needsRefresh = false;
+            }
+        });
 
         for (const eventType of GLOBAL_EVENT_TYPES) {
             source.addEventListener(eventType, (event: MessageEvent<string>) => {
-                const data = JSON.parse(event.data) as { object_id?: string };
-                invalidateForEvent(queryClient, repository.key, eventType, data.object_id ?? undefined);
+                try {
+                    const data = JSON.parse(event.data) as { object_id?: string };
+                    invalidateForEvent(queryClient, repository.key, eventType, data.object_id ?? undefined);
+                } catch {
+                    showError("Live updates failed", "Could not parse server event; refreshing data.");
+                    invalidateRepository(queryClient, repository.key);
+                }
             });
         }
 
         return () => {
             source.close();
         };
-    }, [queryClient, repository]);
+    }, [queryClient, repository, showError]);
 }