diff --git a/src/data/todo.ts b/src/data/todo.ts
index 9af8ef0f4c..659c8d0c3c 100644
--- a/src/data/todo.ts
+++ b/src/data/todo.ts
@@ -83,9 +83,12 @@ export const updateItem = (
       item: item.uid,
       rename: item.summary,
       status: item.status,
-      description: item.description || null,
+      description: item.description,
       due_datetime: item.due?.includes("T") ? item.due : undefined,
-      due_date: item.due?.includes("T") ? undefined : item.due || null,
+      due_date:
+        item.due === undefined || item.due?.includes("T")
+          ? undefined
+          : item.due,
     },
     { entity_id }
   );
@@ -102,7 +105,10 @@ export const createItem = (
       item: item.summary,
       description: item.description || undefined,
       due_datetime: item.due?.includes("T") ? item.due : undefined,
-      due_date: item.due?.includes("T") ? undefined : item.due,
+      due_date:
+        item.due === undefined || item.due?.includes("T")
+          ? undefined
+          : item.due,
     },
     { entity_id }
   );
diff --git a/src/panels/lovelace/cards/hui-todo-list-card.ts b/src/panels/lovelace/cards/hui-todo-list-card.ts
index 3352f7a42b..d1d62880f8 100644
--- a/src/panels/lovelace/cards/hui-todo-list-card.ts
+++ b/src/panels/lovelace/cards/hui-todo-list-card.ts
@@ -476,7 +476,8 @@ export class HuiTodoListCard extends LitElement implements LovelaceCard {
       return;
     }
     await updateItem(this.hass!, this._entityId!, {
-      ...item,
+      uid: item.uid,
+      summary: item.summary,
       status:
         item.status === TodoItemStatus.NeedsAction
           ? TodoItemStatus.Completed
diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts
index cd26ad35fc..daa5eff686 100644
--- a/src/panels/todo/dialog-todo-item-editor.ts
+++ b/src/panels/todo/dialog-todo-item-editor.ts
@@ -324,14 +324,20 @@ class DialogTodoItemEditor extends LitElement {
           (this._todoListSupportsFeature(
             TodoListEntityFeature.SET_DESCRIPTION_ON_ITEM
           )
-            ? // backend should accept null to clear the field, but it doesn't now
-              null
+            ? null
             : undefined),
         due: this._due
           ? this._hasTime
             ? this._due.toISOString()
             : this._formatDate(this._due)
-          : null,
+          : this._todoListSupportsFeature(
+                TodoListEntityFeature.SET_DUE_DATETIME_ON_ITEM
+              ) ||
+              this._todoListSupportsFeature(
+                TodoListEntityFeature.SET_DUE_DATE_ON_ITEM
+              )
+            ? null
+            : undefined,
         status: this._checked
           ? TodoItemStatus.Completed
           : TodoItemStatus.NeedsAction,