diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts
index 7589c3cde0..7df287b72b 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts
@@ -156,15 +156,6 @@ export const TASK_REPEAT_CFG_FORM_CFG_BEFORE_TAGS: FormlyFieldConfig[] = [
     ],
   },
   // REPEAT CFG END
-  {
-    key: 'repeatFromCompletionDate',
-    type: 'checkbox',
-    defaultValue: false,
-    templateOptions: {
-      label: T.F.TASK_REPEAT.F.REPEAT_FROM_COMPLETION_DATE,
-      description: T.F.TASK_REPEAT.F.REPEAT_FROM_COMPLETION_DATE_DESCRIPTION,
-    },
-  },
 
   {
     fieldGroupClassName: 'formly-row',
@@ -250,4 +241,15 @@ export const TASK_REPEAT_CFG_ADVANCED_FORM_CFG: FormlyFieldConfig[] = [
     },
     className: 'sp-formly-child-option',
   },
+  // Repeat from completion date instead of start date
+  {
+    key: 'repeatFromCompletionDate',
+    type: 'checkbox',
+    defaultValue: false,
+    hideExpression: (model: any) => model.quickSetting !== 'CUSTOM',
+    templateOptions: {
+      label: T.F.TASK_REPEAT.F.REPEAT_FROM_COMPLETION_DATE,
+      description: T.F.TASK_REPEAT.F.REPEAT_FROM_COMPLETION_DATE_DESCRIPTION,
+    },
+  },
 ];
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index efefb5a30d..76feaa43c9 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -1452,8 +1452,8 @@
         "WEDNESDAY": "Wednesday",
         "INHERIT_SUBTASKS": "Inherit subtasks",
         "INHERIT_SUBTASKS_DESCRIPTION": "When enabled, subtasks from the most recent task instance will be recreated with the repeating task",
-        "REPEAT_FROM_COMPLETION_DATE": "Repeat from completion",
-        "REPEAT_FROM_COMPLETION_DATE_DESCRIPTION": "When enabled, the next task will be created based on when you complete the current one. The start date will be updated to the completion date, rather than using the original fixed start date.",
+        "REPEAT_FROM_COMPLETION_DATE": "Repeat, when done",
+        "REPEAT_FROM_COMPLETION_DATE_DESCRIPTION": "The next task is created from your completion date, not from start date. (e.g., 'Every 7 days' = 7 days after completion)",
         "REMOVE_INSTANCE": "Remove today",
         "REMOVE_FOR_DATE": "Remove for {{date}}",
         "DISABLE_AUTO_UPDATE_SUBTASKS": "Disable auto-updating subtasks",