diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
index e4754b86f4f..0eb0029cb54 100644
--- a/apps/files_sharing/src/components/SharingEntry.vue
+++ b/apps/files_sharing/src/components/SharingEntry.vue
@@ -428,9 +428,8 @@ export default {
 			this.share.permissions = permissions
 			if (this.share.hasDownloadPermission !== isDownloadChecked) {
 				this.share.hasDownloadPermission = isDownloadChecked
-				this.queueUpdate('attributes')
 			}
-			this.queueUpdate('permissions')
+			this.queueUpdate('permissions', 'attributes')
 		},
 
 		/**
diff --git a/apps/files_sharing/src/models/Share.js b/apps/files_sharing/src/models/Share.js
index 0e96987c005..e6512c67f8c 100644
--- a/apps/files_sharing/src/models/Share.js
+++ b/apps/files_sharing/src/models/Share.js
@@ -50,6 +50,7 @@ export default class Share {
 				console.warn('Could not parse share attributes returned by server: "' + ocsData.attributes + '"')
 			}
 		}
+		ocsData.attributes = ocsData.attributes ?? []
 
 		// store state
 		this._share = ocsData