diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
index baade5be08..11113b2678 100644
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@@ -1692,7 +1692,7 @@ export function createModel (builder: Builder): void {
         component: tags.component.ObjectsTagsEditorPopup,
         element: 'top',
         fillProps: {
-          _objects: 'objects'
+          _objects: 'value'
         }
       },
       label: tracker.string.Labels,
diff --git a/plugins/tags-resources/src/components/ObjectsTagsEditorPopup.svelte b/plugins/tags-resources/src/components/ObjectsTagsEditorPopup.svelte
index 3e707f7f6f..45c7a0b25b 100644
--- a/plugins/tags-resources/src/components/ObjectsTagsEditorPopup.svelte
+++ b/plugins/tags-resources/src/components/ObjectsTagsEditorPopup.svelte
@@ -18,7 +18,8 @@
   import tags, { TagElement, TagReference } from '@hcengineering/tags'
   import TagsPopup from './TagsPopup.svelte'
 
-  export let objects: Doc[]
+  export let value: Doc | Doc[]
+  $: objects = Array.isArray(value) ? value : [value]
 
   let selected: Ref<TagElement>[] = []
   let tagRefs: TagReference[] = []