diff --git a/src/vpu-official-signature-pdf-upload.js b/src/vpu-official-signature-pdf-upload.js
index 3bf2f92a01a4c9924ca889151d3d48fc5cd87d89..0c03d4873254a79834906015d3387e756cbd412b 100644
--- a/src/vpu-official-signature-pdf-upload.js
+++ b/src/vpu-official-signature-pdf-upload.js
@@ -850,7 +850,9 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
                 <vpu-mini-spinner></vpu-mini-spinner>
             </div>
             <vpu-file-sink id="file-sink"
-                nextcloud-auth-url="${this.showTestNextcloudFilePicker ? nextcloudWebAppPasswordURL : ""}"
+                filename="signed-documents.zip"
+                enabled-destinations="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
+                nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${nextcloudWebDavURL}"
                 lang="${this.lang}"
                 ></vpu-file-sink>
diff --git a/src/vpu-qualified-signature-pdf-upload.js b/src/vpu-qualified-signature-pdf-upload.js
index 7df02aced6de19dd2c278cb9f107640182c3df6f..b2db1d1060a14efc1b3dd9a73a52c8cccfaa9059 100644
--- a/src/vpu-qualified-signature-pdf-upload.js
+++ b/src/vpu-qualified-signature-pdf-upload.js
@@ -1033,7 +1033,9 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
                 <vpu-mini-spinner></vpu-mini-spinner>
             </div>
             <vpu-file-sink id="file-sink"
-                nextcloud-auth-url="${this.showTestNextcloudFilePicker ? nextcloudWebAppPasswordURL : ""}"
+                filename="signed-documents.zip"
+                enabled-destinations="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
+                nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${nextcloudWebDavURL}"
                 lang="${this.lang}"
                 ></vpu-file-sink>
diff --git a/src/vpu-signature-lit-element.js b/src/vpu-signature-lit-element.js
index 6baa988da7499359eb1b31bf01cd537014d896ea..4986e5d0972aa012f74f793c7cc5ec3a197bcb0e 100644
--- a/src/vpu-signature-lit-element.js
+++ b/src/vpu-signature-lit-element.js
@@ -218,9 +218,7 @@ export default class VPUSignatureLitElement extends LitElement {
             files.push(binaryFile);
         });
 
-        const detail = { "files": files, "filename": "signed-documents.zip" };
-        const event = new CustomEvent("vpu-file-sink-download-compressed-files", { "detail": detail });
-        this._("#file-sink").dispatchEvent(event);
+        this._("#file-sink").files = files;
         this._("#zip-download-button").stop();
     }
 }
diff --git a/vendor/file-handling b/vendor/file-handling
index d6a90d5137a055b51affc02ad9fba00d601d5b8a..ea721991b0374c0a9ef83e4cdd2dd075aaa3f73a 160000
--- a/vendor/file-handling
+++ b/vendor/file-handling
@@ -1 +1 @@
-Subproject commit d6a90d5137a055b51affc02ad9fba00d601d5b8a
+Subproject commit ea721991b0374c0a9ef83e4cdd2dd075aaa3f73a