diff --git a/client/src/utils/upload-queue.js b/client/src/utils/upload-queue.js
index 854ae90de567..a3a43bd8c5b1 100644
--- a/client/src/utils/upload-queue.js
+++ b/client/src/utils/upload-queue.js
@@ -51,8 +51,10 @@ export class UploadQueue {
     // Remove file from queue and file set by index
     remove(index) {
         const file = this.queue.get(index);
-        const fileSetKey = file.name + file.size;
-        this.queue.delete(index) && this.fileSet.delete(fileSetKey);
+        if (file) {
+            const fileSetKey = file.name + file.size;
+            this.queue.delete(index) && this.fileSet.delete(fileSetKey);
+        }
     }
 
     // Remove all entries from queue