diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index 9c3d9d8ba..28507736c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -1382,6 +1382,10 @@ class EventActivity : SimpleActivity() {
                         mEvent.id = null
                         eventsHelper.apply {
                             addEventRepeatLimit(eventId, mEventOccurrenceTS)
+                            if (mEventOccurrenceTS == originalEvent.startTS) {
+                                deleteEvent(eventId, true)
+                            }
+
                             insertEvent(mEvent, addToCalDAV = true, showToasts = true) {
                                 finish()
                             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
index cf1e94685..99b2a1edf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
@@ -495,6 +495,10 @@ class TaskActivity : SimpleActivity() {
                         mTask.id = null
                         eventsHelper.apply {
                             addEventRepeatLimit(taskId, mTaskOccurrenceTS)
+                            if (mTaskOccurrenceTS == originalTask.startTS) {
+                                deleteEvent(taskId, true)
+                            }
+
                             insertTask(mTask, showToasts = true) {
                                 finish()
                             }