diff --git a/src/plugins/Multipart.js b/src/plugins/Multipart.js
index 6b1b5220d..bced3a9e2 100644
--- a/src/plugins/Multipart.js
+++ b/src/plugins/Multipart.js
@@ -151,11 +151,6 @@ module.exports = class Multipart extends Plugin {
   }
 
   selectForUpload (files) {
-    if (Object.keys(files).length === 0) {
-      this.core.log('no files to upload!')
-      return
-    }
-
     files.forEach((file, i) => {
       const current = parseInt(i, 10) + 1
       const total = files.length
@@ -177,6 +172,11 @@ module.exports = class Multipart extends Plugin {
   }
 
   handleUpload (fileIDs) {
+    if (fileIDs.length === 0) {
+      this.core.log('Multipart: no files to upload!')
+      return Promise.resolve()
+    }
+
     this.core.log('Multipart is uploading...')
     const files = fileIDs.map(getFile, this)
     function getFile (fileID) {
diff --git a/src/plugins/Tus10.js b/src/plugins/Tus10.js
index 786cc5d27..a0ff64272 100644
--- a/src/plugins/Tus10.js
+++ b/src/plugins/Tus10.js
@@ -281,11 +281,6 @@ module.exports = class Tus10 extends Plugin {
   }
 
   uploadFiles (files) {
-    if (Object.keys(files).length === 0) {
-      this.core.log('no files to upload!')
-      return
-    }
-
     files.forEach((file, index) => {
       const current = parseInt(index, 10) + 1
       const total = files.length
@@ -299,6 +294,11 @@ module.exports = class Tus10 extends Plugin {
   }
 
   handleUpload (fileIDs) {
+    if (fileIDs.length === 0) {
+      this.core.log('Tus: no files to upload!')
+      return Promise.resolve()
+    }
+
     this.core.log('Tus is uploading...')
     const filesToUpload = fileIDs.map(getFile, this)
     function getFile (fileID) {