diff --git a/app/routes/report.tsx b/app/routes/report.tsx
index 4a9fad9..a75fe06 100644
--- a/app/routes/report.tsx
+++ b/app/routes/report.tsx
@@ -184,16 +184,21 @@ export default function () {
       xhr.upload.addEventListener("progress", increaseProgress);
       xhr.upload.onabort = () => {
         shouldRecall = true;
+        setUploading(false);
+        setFileProgress(0);
       };
       xhr.upload.onerror = () => {
         shouldRecall = true;
+        setUploading(false);
+        setFileProgress(0);
+      };
+      xhr.upload.onloadend = () => {
+        if (i === upload_urls.length - 1) setUploading(false);
       };
 
       xhr.send(files[i]);
     }
 
-    setUploading(false);
-
     if (shouldRecall) {
       setLoading(false);
       await fetch("/api/reports/recall", {
@@ -309,7 +314,7 @@ export default function () {
             Submit
           </Button>
           <CircularProgress
-            display={uploading ? "" : "none"}
+            display={uploading ? undefined : "none"}
             value={fileProgress}
           >
             <CircularProgressLabel>{fileProgress}%</CircularProgressLabel>