diff --git a/web/src/pages/Exports.tsx b/web/src/pages/Exports.tsx
index 7b336d7ad4..244fcf7635 100644
--- a/web/src/pages/Exports.tsx
+++ b/web/src/pages/Exports.tsx
@@ -5,6 +5,7 @@ import {
CaseCard,
ExportCard,
} from "@/components/card/ExportCard";
+import ActivityIndicator from "@/components/indicators/activity-indicator";
import {
AlertDialog,
AlertDialogCancel,
@@ -864,6 +865,7 @@ function Exports() {
search={search}
selectedExports={selectedExports}
selectionMode={selectionMode}
+ isLoading={cases === undefined || rawExports === undefined}
onSelectExport={onSelectExport}
setSelected={setSelected}
renameClip={onHandleRename}
@@ -882,6 +884,7 @@ function Exports() {
activeJobs={activeJobsByCase["none"] || []}
selectedExports={selectedExports}
selectionMode={selectionMode}
+ isLoading={cases === undefined || rawExports === undefined}
onSelectExport={onSelectExport}
setSelectedCaseId={setSelectedCaseId}
setSelected={setSelected}
@@ -903,6 +906,7 @@ type AllExportsViewProps = {
activeJobs: ExportJob[];
selectedExports: Export[];
selectionMode: boolean;
+ isLoading: boolean;
onSelectExport: (e: Export) => void;
setSelectedCaseId: (id: string) => void;
setSelected: (e: Export) => void;
@@ -919,6 +923,7 @@ function AllExportsView({
activeJobs,
selectedExports,
selectionMode,
+ isLoading,
onSelectExport,
setSelectedCaseId,
setSelected,
@@ -1027,6 +1032,8 @@ function AllExportsView({
)}
+ ) : isLoading ? (
+