diff --git a/plugins/task-resources/src/components/state/DoneStateRefPresenter.svelte b/plugins/task-resources/src/components/state/DoneStateRefPresenter.svelte
index fc27e8c8f9..9b62e58911 100644
--- a/plugins/task-resources/src/components/state/DoneStateRefPresenter.svelte
+++ b/plugins/task-resources/src/components/state/DoneStateRefPresenter.svelte
@@ -15,10 +15,13 @@
 -->
 <script lang="ts">
   import { Ref, Status, StatusValue } from '@hcengineering/core'
+  import { DoneState, SpaceWithStates } from '@hcengineering/task'
+  import { Label } from '@hcengineering/ui'
   import { statusStore } from '@hcengineering/view-resources'
-  import type { DoneState, SpaceWithStates } from '@hcengineering/task'
-  import DoneStatePresenter from './DoneStatePresenter.svelte'
+  import task from '../../plugin'
+  import Unknown from '../icons/Unknown.svelte'
   import DoneStateEditor from './DoneStateEditor.svelte'
+  import DoneStatePresenter from './DoneStatePresenter.svelte'
 
   export let value: Ref<DoneState> | StatusValue
   export let space: Ref<SpaceWithStates> | undefined
@@ -34,4 +37,9 @@
   {:else}
     <DoneStatePresenter value={state} {showTitle} />
   {/if}
+{:else}
+  <div class="flex-row-center pointer-events-none">
+    <div class="content-dark-color mr-2"><Unknown size={'small'} /></div>
+    <span class="overflow-label"><Label label={task.string.NoDoneState} /></span>
+  </div>
 {/if}
diff --git a/plugins/view-resources/src/components/filter/StatusFilter.svelte b/plugins/view-resources/src/components/filter/StatusFilter.svelte
index 4e87c982d9..b3b28aaad6 100644
--- a/plugins/view-resources/src/components/filter/StatusFilter.svelte
+++ b/plugins/view-resources/src/components/filter/StatusFilter.svelte
@@ -74,12 +74,12 @@
     for (const object of filter.value) {
       targets.add(object)
     }
+    const isDone = hierarchy.isDerived(targetClass, task.class.DoneState)
 
     if (space !== undefined) {
       const _space = await client.findOne(task.class.SpaceWithStates, { _id: space as Ref<SpaceWithStates> })
       if (_space) {
-        const targetClass = (filter.key.attribute.type as RefTo<Status>).to
-        const key = hierarchy.isDerived(targetClass, task.class.DoneState) ? 'doneStates' : 'states'
+        const key = isDone ? 'doneStates' : 'states'
         values = (_space as any)[key].map((p: Ref<Status>) => statusStore.get(p)).filter((p: Status) => p !== undefined)
         for (const value of values) {
           targets.add(value?._id)
@@ -98,7 +98,7 @@
       }
       values = await sort(statuses)
     }
-    if (targets.has(undefined)) {
+    if (targets.has(undefined) || isDone) {
       values.unshift(undefined)
     }
     if (values.length !== targets.size) {
diff --git a/plugins/view-resources/src/components/list/ListPresenter.svelte b/plugins/view-resources/src/components/list/ListPresenter.svelte
index 0119f6995d..8cdec3c04b 100644
--- a/plugins/view-resources/src/components/list/ListPresenter.svelte
+++ b/plugins/view-resources/src/components/list/ListPresenter.svelte
@@ -33,7 +33,7 @@
     if (attribute.attribute?.type._class === core.class.EnumOf) {
       return { ...clearAttributeProps, type: attribute.attribute.type, ...props }
     }
-    return { object, ...clearAttributeProps, ...props }
+    return { object, ...clearAttributeProps, space: object.space, ...props }
   }
 </script>