diff --git a/public/lib/form/dndupload.js b/public/lib/form/dndupload.js
index f7c91e2040d..e1d7a2a5eec 100644
--- a/public/lib/form/dndupload.js
+++ b/public/lib/form/dndupload.js
@@ -1058,6 +1058,8 @@ M.form_dndupload.init = function(Y, options) {
                             if (result.error) {
                                 self.print_msg(result.error, 'error', result.errorcode);
                                 self.uploadfinished();
+                                // Don't do anything else after reporting the error.
+                                return;
                             } else {
                                 // Only update the filepicker if there were no errors
                                 if (result.event == 'fileexists') {