diff --git a/apps/comments/src/mixins/CommentView.ts b/apps/comments/src/mixins/CommentView.ts
index c6cb3aa9ee0..b2b82693b9c 100644
--- a/apps/comments/src/mixins/CommentView.ts
+++ b/apps/comments/src/mixins/CommentView.ts
@@ -27,6 +27,7 @@ export default defineComponent({
 				key: 'editor',
 			},
 			userData: {},
+			currentResourceId: this.resourceId,
 		}
 	},
 	methods: {
@@ -40,8 +41,8 @@ export default defineComponent({
 			const { data } = await axios.get(generateOcsUrl('core/autocomplete/get'), {
 				params: {
 					search,
-					itemType: 'files',
-					itemId: this.resourceId,
+					itemType: this.resourceType,
+					itemId: this.currentResourceId,
 					sorter: 'commenters|share-recipients',
 					limit: loadState('comments', 'maxAutoCompleteResults'),
 				},
diff --git a/apps/comments/src/views/Comments.vue b/apps/comments/src/views/Comments.vue
index 657af888a12..800b48302e7 100644
--- a/apps/comments/src/views/Comments.vue
+++ b/apps/comments/src/views/Comments.vue
@@ -106,7 +106,6 @@ export default {
 			loading: false,
 			done: false,
 
-			currentResourceId: this.resourceId,
 			offset: 0,
 			comments: [],