diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 98dd8fbd75..bfb6ab1ae8 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -96,7 +96,7 @@ App::post('/v1/functions')
                 'resourceId' => $function->getId(),
                 'resourceUpdatedAt' => DateTime::now(),
                 'projectId' => $project->getId(),
-                'schedule'  => $function['schedule'],
+                'schedule'  => $function->getAttribute('schedule'),
                 'active' => false,
             ]))
         );
@@ -478,8 +478,8 @@ App::put('/v1/functions/:functionId')
         }
 
         $log
-            ->setAttribute('schedule', $function['schedule'])
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
+            ->setAttribute('schedule', $function->getAttribute('schedule'))
+            ->setAttribute('active', $active);
 
         $dbForConsole->updateDocument('schedules', $log->getId(), $log);
 
diff --git a/app/tasks/schedule.php b/app/tasks/schedule.php
index c5df617269..0134fe042c 100644
--- a/app/tasks/schedule.php
+++ b/app/tasks/schedule.php
@@ -1,7 +1,5 @@
 <?php
 
-ini_set('memory_limit', -1);
-ini_set('max_execution_time', -1);
 global $cli;
 global $register;