diff --git a/client/pages/upload/index.vue b/client/pages/upload/index.vue
index 70410fae..8378005b 100644
--- a/client/pages/upload/index.vue
+++ b/client/pages/upload/index.vue
@@ -86,6 +86,13 @@ export default {
       uploadFinished: false
     }
   },
+  watch: {
+    selectedLibrary(newVal) {
+      if (newVal && !this.selectedFolderId) {
+        this.setDefaultFolder()
+      }
+    }
+  },
   computed: {
     inputAccept() {
       var extensions = []