diff --git a/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx b/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx
index bf3d543f1a7f2be75077acec2cc47e6e109e6b6e..19e38afbab90980e4a96c32b023d4d2a07a5dcf5 100644
--- a/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx
+++ b/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx
@@ -325,7 +325,7 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
         }
 
         serverResponses.push(uploadResponse);
-      }else{
+      } else {
         handleFilesChange(sanitizeArrExtFile(arrOfExtFilesInstances), true);
       }
     }
@@ -350,12 +350,15 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
 
     if (!listExtFileLocal) return;
     listExtFileLocal.forEach((extFileInstance: ExtFileInstance) => {
-      if (extFileInstance.uploadStatus === "uploading") {
+      if (
+        extFileInstance.uploadStatus === "uploading" ||
+        extFileInstance.uploadStatus === "preparing"
+      ) {
         if (extFileInstance.xhr !== null && extFileInstance.xhr !== undefined)
           extFileInstance.xhr.abort();
+        extFileInstance.uploadStatus = "aborted";
+        extFileInstance.uploadMessage = "Upload was aborted by user";
       }
-      extFileInstance.uploadStatus = "aborted";
-      //console.log("Aborting extFileInstance", extFileInstance.xhr);
     });
   };