diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index aa913b2da369effccc44aa0ea41eb5f8b70945d3..426b27530b06d24d930103162daf1f7260c62c07 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -375,7 +375,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
 
                 // on Error: try to reload with home directory
                 if ((path !== "/" || path !== "") && this.webDavClient !== null && error.message.search("401") === -1) {
+                    console.log("error in load directory");
+                    this.directoryPath = "";
                     this.loadDirectory("");
+
                 }
                 else {
                     this.loading = false;
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 2d8ae592f75161e72b31419172a369447439e4e3..2662e76886d73aec0665a54e7beb887b7506b84c 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -132,6 +132,12 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
                         this.openDialog();
                     }
                     break;
+                case "nextcloudDefaultDir":
+                    //check if default destination is set
+                    if (this.firstOpen) {
+                        this.nextcloudDir = this.nextcloudDefaultDir;
+                    }
+                    break;
             }
         });
 
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index aee6ce705f599b7df2705ce8c7dd0f8c0b3fd849..e53d39c886d709004e78293eee8e8ec89f69ae84 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -111,6 +111,12 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
                         // this.closeDialog();
                     }
                     break;
+            case "nextcloudDefaultDir":
+                //check if default destination is set
+                if (this.firstOpen) {
+                    this.nextcloudDir = this.nextcloudDefaultDir;
+                }
+                break;
 
             }
         });