diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index 426b27530b06d24d930103162daf1f7260c62c07..158af26220fad48945e6b215fc93e0f57a8561e0 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -374,7 +374,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                 console.error(error.message);
 
                 // on Error: try to reload with home directory
-                if ((path !== "/" || path !== "") && this.webDavClient !== null && error.message.search("401") === -1) {
+                if ((path !== "/" && path !== "") && this.webDavClient !== null && error.message.search("401") === -1) {
                     console.log("error in load directory");
                     this.directoryPath = "";
                     this.loadDirectory("");
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 2662e76886d73aec0665a54e7beb887b7506b84c..fec3f1277e774f3122a121bcdf5f89ee725fa7e5 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -200,7 +200,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
 
 
         //check if default destination is set
-        if (this.defaultSink !== '' && this.firstOpen) {
+        if (this.defaultSink !== '' && typeof this.defaultSink !== 'undefined'  && this.firstOpen) {
             this.activeDestination = this.defaultSink;
             this.nextcloudDir = this.nextcloudDefaultDir;
             if (this._('#nextcloud-file-picker').webDavClient !== null) {
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 1bdf9341d7fc2eec1907f2461c9f10ee26603464..1119e56eda8e2874b73b62cb584aaa8398cab588 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -368,12 +368,12 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
 
 
         //check if default source is set
-        if (this.defaultSink !== '' && this.firstOpen) {
-            this.activeDestination = this.defaultSink;
+        if (this.defaultSource !== '' && typeof this.defaultSource !== 'undefined' && this.firstOpen) {
+            this.activeDestination = this.defaultSource;
             this.nextcloudDir = this.nextcloudDefaultDir;
             if (this._('#nextcloud-file-picker').webDavClient !== null) {
                 this._('#nextcloud-file-picker').loadDirectory(this.nextcloudDefaultDir);
-                console.log("load default nextcloud source");
+                console.log("load default nextcloud source", this.defaultSource);
             }
             this.firstOpen = false;
         }