diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index 73fdf9ba960296044858dda7518c97aef2e43736..0a7e5da6f9cbddccb14402c3f4c7ae8595042c30 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -64,7 +64,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
      * See: https://lit-element.polymer-project.org/guide/properties#initialize
      */
     static get properties() {
-        return {
+        return this.getProperties({
             lang: { type: String },
             authUrl: { type: String, attribute: 'auth-url' },
             webDavUrl: { type: String, attribute: 'web-dav-url' },
@@ -84,7 +84,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
             activeDirectoryACL: { type: String, attribute: false },
             selectAllButton: { type: Boolean, attribute: false },
             abortUploadButton: { type: Boolean, attribute: false },
-        };
+        });
     }
 
     update(changedProperties) {
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 3af358ae63ab5a6511ca20dfb3bad61048496b48..90875ee64e8cea7f44727327a51d448bd36d9c7e 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -45,7 +45,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
      * See: https://lit-element.polymer-project.org/guide/properties#initialize
      */
     static get properties() {
-        return {
+        return this.getProperties({
             context: { type: String, attribute: 'context'},
             lang: { type: String },
             filename: { type: String },
@@ -58,7 +58,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
             buttonLabel: { type: String, attribute: 'button-label' },
             isDialogOpen: { type: Boolean, attribute: false },
             activeDestination: { type: Boolean, attribute: false },
-        };
+        });
     }
 
     async downloadCompressedFiles() {
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index bee797dd90f61a0b25f5f28faceac1ea82edfc7f..f9e93def30555979144aa766f4e9530a161fb2f6 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -63,7 +63,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
      * See: https://lit-element.polymer-project.org/guide/properties#initialize
      */
     static get properties() {
-        return {
+        return this.getProperties({
             context: { type: String, attribute: 'context'},
             lang: { type: String },
             allowedMimeTypes: { type: String, attribute: 'allowed-mime-types' },
@@ -77,7 +77,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
             decompressZip: { type: Boolean, attribute: 'decompress-zip' },
             activeSource: { type: Boolean, attribute: false },
             isDialogOpen: { type: Boolean, attribute: 'dialog-open' },
-        };
+        });
     }
 
     update(changedProperties) {