diff --git a/src/pages/Download.vue b/src/pages/Download.vue
index 92929521791e5ca99fa2422503f8750c63e375e9..3589cd716e30ebf92c4d21d7913020cbcbdcb2a9 100644
--- a/src/pages/Download.vue
+++ b/src/pages/Download.vue
@@ -257,7 +257,7 @@ export default {
       }
     },
     truncate(fullStr, strLen = 35) {
-      if (fullStr.length <= strLen) return fullStr
+      if (fullStr?.length <= strLen) return fullStr
       const separator = '...'
       const sepLen = separator.length, charsToShow = strLen - sepLen,
         frontChars = Math.ceil(charsToShow / 2),
diff --git a/src/pages/Upload.vue b/src/pages/Upload.vue
index 402ad83700f9623e1b59f74f64b683e77df2bb51..620eb8deef397d4bc38a0207710c7710a4214698 100644
--- a/src/pages/Upload.vue
+++ b/src/pages/Upload.vue
@@ -89,6 +89,10 @@ export default {
       this.$router.push('/error')
     }
   },
+  beforeRouteLeave (to, from, next) {
+    this.uppy.close()
+    next()
+  },
   computed: {
     supportedExtensions () {
       return this.$store.getters['Upload/getSupportedExtensions']