diff --git a/plugins/board-resources/src/components/editor/CardDetails.svelte b/plugins/board-resources/src/components/editor/CardDetails.svelte
index d80bf33181..2c8bbeee1b 100644
--- a/plugins/board-resources/src/components/editor/CardDetails.svelte
+++ b/plugins/board-resources/src/components/editor/CardDetails.svelte
@@ -99,7 +99,9 @@
       <div class="text-md font-medium">
         <Label label={board.string.Dates} />
       </div>
-      <DatePresenter {value} on:click={dateHandler} />
+      {#key value.date}
+        <DatePresenter {value} on:click={dateHandler} />
+      {/key}
     </div>
   {/if}
 {/if}
diff --git a/plugins/board-resources/src/components/popups/DateRangePicker.svelte b/plugins/board-resources/src/components/popups/DateRangePicker.svelte
index e5bf490f8d..ce43d7683d 100644
--- a/plugins/board-resources/src/components/popups/DateRangePicker.svelte
+++ b/plugins/board-resources/src/components/popups/DateRangePicker.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
   import { Label, Button, DateRangePresenter, CheckBox, Component } from '@anticrm/ui'
-  import { Card } from '@anticrm/board'
+  import { Card, CardDate } from '@anticrm/board'
   import calendar from '@anticrm/calendar'
   import board from '../../plugin'
   import { getClient } from '@anticrm/presentation';
@@ -19,6 +19,13 @@
   let savedDueDate = object.date?.dueDate ?? Date.now()
   let dueDateEnabled = dueDate !== undefined
   $: dueDate && (savedDueDate = dueDate)
+
+  function update () {
+    const date: CardDate = {}
+    if (startDate !== undefined) date.startDate = startDate
+    if (dueDate !== undefined) date.dueDate = dueDate
+    client.update(object, {date})
+  }
 </script>
 
 <div class="antiPopup antiPopup-withHeader antiPopup-withTitle antiPopup-withCategory w-85">
@@ -70,7 +77,7 @@
       size={'small'}
       kind={'primary'}
       on:click={() => {
-        client.update(object, {date: {startDate, dueDate}})
+        update()
         dispatch('close')
       }}
     />
diff --git a/plugins/board-resources/src/components/presenters/DatePresenter.svelte b/plugins/board-resources/src/components/presenters/DatePresenter.svelte
index 40b1141e81..71c7d9a1d0 100644
--- a/plugins/board-resources/src/components/presenters/DatePresenter.svelte
+++ b/plugins/board-resources/src/components/presenters/DatePresenter.svelte
@@ -8,11 +8,16 @@
   const client = getClient()
   const {date} = value
   let isChecked = date?.isChecked
+
+  function update(){
+    if (isChecked === undefined) return
+    client.update(value, {date: {...date, isChecked}})
+  }
 </script>
 
 {#if date}
   <div class="flex-presenter flex-gap-1 h-full">
-    <CheckBox bind:checked={isChecked} on:value={() => client.update(value, {date: {...date, isChecked}})}/>
+    <CheckBox bind:checked={isChecked} on:value={update}/>
     <div class="flex-center h-full" on:click>
       <div class="flex-row-center background-button-bg-color border-radius-1 w-full">
         {#if date.startDate}