diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index 8f28a8a6c70015dea2e2e3c7590c28c535e58a35..a2822795d794e44f82cfdb76b1cf10014c2e507d 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -300,11 +300,9 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                     this.loginWindow.close();
                 }
 
-                const apiUrl = this.webDavUrl + "/" + data.loginName;
                 // see https://github.com/perry-mitchell/webdav-client/blob/master/API.md#module_WebDAV.createClient
-
                 this.webDavClient = createClient(
-                    apiUrl,
+                    data.webdavUrl ?? this.webDavUrl + "/" + data.loginName,
                     {
                         username: data.loginName,
                         password: data.token