diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index a0c2eb7a..ae724ab2 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -436,7 +436,15 @@ class TasksManager:
             and "cron_string" in job_data
             and "interval_type" in job_data
         ):
-            return
+            if not "enabled" in job_data:
+                return
+            else:
+                if job_data["enabled"] is True:
+                    job_data = HelpersManagement.get_scheduled_task(sch_id)
+                    job_data["server_id"] = job_data["server_id"]["server_id"]
+                else:
+                    self.scheduler.remove_job(str(sch_id))
+                    return
 
         try:
             if job_data["interval"] != "reaction":
diff --git a/app/classes/web/routes/api/servers/server/tasks/task/index.py b/app/classes/web/routes/api/servers/server/tasks/task/index.py
index 3c567fdd..c4ddde8d 100644
--- a/app/classes/web/routes/api/servers/server/tasks/task/index.py
+++ b/app/classes/web/routes/api/servers/server/tasks/task/index.py
@@ -97,7 +97,7 @@ class ApiServersServerTasksTaskIndexHandler(BaseApiHandler):
         if str(data.get("parent")) == str(task_id) and data.get("parent") is not None:
             data["parent"] = None
 
-        HelpersManagement.update_scheduled_task(task_id, data)
+        self.tasks_manager.update_job(task_id, data)
 
         self.controller.management.add_to_audit_log(
             auth_data[4]["user_id"],