diff --git a/tdrive/frontend/src/app/features/files/services/file-upload-service.ts b/tdrive/frontend/src/app/features/files/services/file-upload-service.ts
index c2ee3539..672fd86e 100644
--- a/tdrive/frontend/src/app/features/files/services/file-upload-service.ts
+++ b/tdrive/frontend/src/app/features/files/services/file-upload-service.ts
@@ -297,6 +297,9 @@ class FileUploadService {
     for (const rootKey of rootKeys) {
       if (rootKey in this.groupIds) {
         this.resetStates([rootKey]);
+      } else {
+        // remove from completed states
+        delete this.rootStates.completed[rootKey];
       }
     }
 
@@ -524,6 +527,10 @@ class FileUploadService {
     this.groupIds = {};
 
     this.notify();
+
+    // reset the states for next upload
+    this.resetStates(Object.keys(this.rootStates.completed));
+    this.notify();
   }
 
   public cancelRootUpload(id: string) {