diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs
index 3e6d5ba386ccda3d428ceb972efcf0cfe2b81a48..a8f7fb78b27daf1aa44f69435064be192eb80a1e 100644
--- a/assets/dbp-signature.html.ejs
+++ b/assets/dbp-signature.html.ejs
@@ -98,6 +98,7 @@
     nextcloud-webdav-url="<%= nextcloudWebDavURL %>"
     nextcloud-name="<%= nextcloudName %>"
     nextcloud-file-url="<%= nextcloudFileURL %>"
+    nextcloud-store-session
     html-overrides="global-override"
     src="<%= getUrl(name + '.topic.metadata.json') %>"
     base-path="<%= getUrl('') %>"
diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index 1a1e8f8c173e2fb4377f97e4a369478beb238fb0..3c53378f5b473372c24ab30d9c78deec074f9b58 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -531,6 +531,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                         <dbp-file-source
                             id="file-source"
                             context="${i18n.t('official-pdf-upload.file-picker-context')}"
+                            subscribe="nextcloud-store-session:nextcloud-store-session"
                             allowed-mime-types="application/pdf"
                             enabled-targets="${this.fileHandlingEnabledTargets}"
                             nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
@@ -768,7 +769,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                     count: this.signedFilesToDownload,
                 })}"
                 filename="signed-documents.zip"
-                subscribe="initial-file-handling-state:initial-file-handling-state,clipboard-files:clipboard-files"
+                subscribe="initial-file-handling-state:initial-file-handling-state,clipboard-files:clipboard-files,nextcloud-store-session:nextcloud-store-session"
                 enabled-targets="${this.fileHandlingEnabledTargets}"
                 nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 471d351c2598e618f1c800b36facfcad18b997ce..0ac9079dbf5c3420e9ec0a1506577e227b49a6fe 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -682,6 +682,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                         </button>
                         <dbp-file-source
                             id="file-source"
+                            subscribe="nextcloud-store-session:nextcloud-store-session"
                             context="${i18n.t('qualified-pdf-upload.file-picker-context')}"
                             allowed-mime-types="application/pdf"
                             enabled-targets="${this.fileHandlingEnabledTargets}"
@@ -953,7 +954,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                     count: this.signedFilesToDownload,
                 })}"
                 filename="signed-documents.zip"
-                subscribe="initial-file-handling-state:initial-file-handling-state"
+                subscribe="initial-file-handling-state:initial-file-handling-state,nextcloud-store-session:nextcloud-store-session"
                 enabled-targets="${this.fileHandlingEnabledTargets}"
                 nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${this.nextcloudWebDavURL}"