diff --git a/package.json b/package.json
index 2a1518d..094d40a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "donetick",
   "private": true,
-  "version": "0.1.106",
+  "version": "0.1.107",
   "type": "module",
   "engines": {
     "node": ">=20.0.0",
diff --git a/src/views/ChoreEdit/ChoreEdit.jsx b/src/views/ChoreEdit/ChoreEdit.jsx
index a558ccb..b41d502 100644
--- a/src/views/ChoreEdit/ChoreEdit.jsx
+++ b/src/views/ChoreEdit/ChoreEdit.jsx
@@ -290,6 +290,7 @@ const ChoreEdit = () => {
       )
       setIsRolling(data.res.isRolling)
       setIsActive(data.res.isActive)
+      setSubTasks(data.res.subTasks ? data.res.subTasks : [])
 
       if (isCloneMode) {
         if (data.res.subTasks) {
diff --git a/src/views/components/AddTaskModal.jsx b/src/views/components/AddTaskModal.jsx
index 651621e..8d3b159 100644
--- a/src/views/components/AddTaskModal.jsx
+++ b/src/views/components/AddTaskModal.jsx
@@ -428,6 +428,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => {
     if (!frequency && dueDate) {
       // use dueDate converted to UTC:
       chore.nextDueDate = new Date(dueDate).toUTCString()
+      chore.notificationMetadata = notificationMetadata
     }
 
     createChoreMutation
@@ -620,7 +621,6 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => {
               setHasNotifications(true)
               setFrequencyHumanReadable('Once')
               setFrequency(null)
-              setDueDate(moment().add(1, 'day').format('YYYY-MM-DDTHH:00:00'))
             }}
           >
             Edit Notifications