diff --git a/Dockerfile.dev b/Dockerfile.dev
index 1b37940fc0e173b93f5bfe32049e2525e2787c3e..ba4289166f78bd0119a81c75741aa1351e6458bd 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -2,6 +2,7 @@
 FROM node:14 as develop-stage
 WORKDIR /app
 COPY package*.json ./
+COPY yarn.lock ./
 RUN yarn global add @quasar/cli
 # build stage
 FROM develop-stage as build-stage
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..929deb8929f24c5c9c22f627ebc6b95dca16b350 100644
--- a/src/pages/Upload.vue
+++ b/src/pages/Upload.vue
@@ -89,6 +89,12 @@ export default {
       this.$router.push('/error')
     }
   },
+  beforeRouteLeave (to, from, next) {
+    if (this.uppy) {
+      this.uppy.close()
+    }
+    next()
+  },
   computed: {
     supportedExtensions () {
       return this.$store.getters['Upload/getSupportedExtensions']