diff --git a/app/controller.js b/app/controller.js
index b43a91ca..897679e0 100644
--- a/app/controller.js
+++ b/app/controller.js
@@ -98,6 +98,9 @@ export default function(state, emitter) {
   });
 
   emitter.on('addFiles', async ({ files }) => {
+    if (files.length < 1) {
+      return;
+    }
     const maxSize = state.user.maxSize;
     state.archive = state.archive || new Archive();
     try {
diff --git a/app/dragManager.js b/app/dragManager.js
index f5133a0a..1379c004 100644
--- a/app/dragManager.js
+++ b/app/dragManager.js
@@ -6,7 +6,12 @@ export default function(state, emitter) {
       }
     });
     document.body.addEventListener('drop', event => {
-      if (state.route === '/' && !state.uploading) {
+      if (
+        state.route === '/' &&
+        !state.uploading &&
+        event.dataTransfer &&
+        event.dataTransfer.files
+      ) {
         event.preventDefault();
         emitter.emit('addFiles', {
           files: Array.from(event.dataTransfer.files)