diff --git a/app/library/Tasks.py b/app/library/Tasks.py
index 8e68bdc4..256283a0 100644
--- a/app/library/Tasks.py
+++ b/app/library/Tasks.py
@@ -35,7 +35,7 @@ class Task:
     template: str = ""
     cli: str = ""
     auto_start: bool = True
-    enabled_handler: bool = True
+    handler_enabled: bool = True
 
     def serialize(self) -> dict:
         return self.__dict__
@@ -406,7 +406,7 @@ class HandleTask:
 
     def _dispatcher(self):
         for task in self._tasks.get_all():
-            if not task.enabled_handler:
+            if not task.handler_enabled:
                 continue
 
             try:
diff --git a/ui/app/components/TaskForm.vue b/ui/app/components/TaskForm.vue
index 4d22abaf..459a7c5d 100644
--- a/ui/app/components/TaskForm.vue
+++ b/ui/app/components/TaskForm.vue
@@ -222,10 +222,10 @@
                     Enable Handler
                   </label>
                   <div class="control is-unselectable">
-                    <input id="auto_start" type="checkbox" v-model="form.enabled_handler" :disabled="addInProgress"
+                    <input id="auto_start" type="checkbox" v-model="form.handler_enabled" :disabled="addInProgress"
                       class="switch is-success" />
                     <label for="auto_start" class="is-unselectable">
-                      {{ form.enabled_handler ? 'Yes' : 'No' }}
+                      {{ form.handler_enabled ? 'Yes' : 'No' }}
                     </label>
                   </div>
                   <span class="help">
@@ -344,8 +344,8 @@ onMounted(() => {
     form.auto_start = true
   }
 
-  if (typeof form.enabled_handler === 'undefined' || null === form.enabled_handler) {
-    form.enabled_handler = true
+  if (typeof form.handler_enabled === 'undefined' || null === form.handler_enabled) {
+    form.handler_enabled = true
   }
 
 })
diff --git a/ui/app/pages/conditions.vue b/ui/app/pages/conditions.vue
index d8a637d8..143b48dc 100644
--- a/ui/app/pages/conditions.vue
+++ b/ui/app/pages/conditions.vue
@@ -240,7 +240,7 @@ const updateItem = async ({ reference, item: updatedItem, }: {
   reference: string | null | undefined,
   item: ConditionItem
 }): Promise<void> => {
-  updatedItem = cleanObject(updatedItem, remove_keys)
+  updatedItem = cleanObject(updatedItem, remove_keys) as ConditionItem
 
   if (reference) {
     const index = items.value.findIndex(t => t?.id === reference)
diff --git a/ui/app/pages/tasks.vue b/ui/app/pages/tasks.vue
index 71b58756..3aa4ccbc 100644
--- a/ui/app/pages/tasks.vue
+++ b/ui/app/pages/tasks.vue
@@ -162,7 +162,7 @@ div.is-centered {
                       &nbsp;
                       <span class="icon-text">
                         <span class="icon"><i class="fa-solid fa-rss" /></span>
-                        <span>{{ item.enabled_handler ? 'Enabled' : 'Disabled' }}</span>
+                        <span>{{ item.handler_enabled ? 'Enabled' : 'Disabled' }}</span>
                       </span>
                       &nbsp;
                       <span class="icon-text" v-if="item.preset">
@@ -239,7 +239,7 @@ div.is-centered {
                     </span>
                   </div>
                   <div class="control">
-                    <span class="icon" v-tooltip="`RSS monitoring is ${item.enabled_handler ? 'enabled' : 'disabled'}`">
+                    <span class="icon" v-tooltip="`RSS monitoring is ${item.handler_enabled ? 'enabled' : 'disabled'}`">
                       <i class="fa-solid fa-rss has-text-success" />
                     </span>
                   </div>
diff --git a/ui/app/types/tasks.ts b/ui/app/types/tasks.ts
index f0cf7838..bf81c068 100644
--- a/ui/app/types/tasks.ts
+++ b/ui/app/types/tasks.ts
@@ -9,7 +9,7 @@ type task_item = {
   timer?: string,
   in_progress?: boolean,
   auto_start?: boolean,
-  enabled_handler?: boolean,
+  handler_enabled?: boolean,
 }
 
 type exported_task = task_item & { _type: string, _version: string }