diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 02c3fce885..7204271d0f 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -1157,8 +1157,7 @@ App::post('/v1/functions/:functionId/executions')
                 ->setData($data)
                 ->setJWT($jwt)
                 ->setProject($project)
-                ->setUser($user)
-                ->trigger();
+                ->setUser($user);
 
             return $response
                 ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
diff --git a/app/worker.php b/app/worker.php
index dabb91f1d8..564a577c71 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -33,7 +33,7 @@ Server::setResource('dbForConsole', function (Cache $cache, Registry $register)
 }, ['cache', 'register']);
 
 Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Database $dbForConsole) {
-    $args = $message->getPayload()['value'] ?? [];
+    $args = $message->getPayload() ?? [];
     $project = new Document($args['project'] ?? []);
 
     if ($project->isEmpty() || $project->getId() === 'console') {
diff --git a/app/workers/builds.php b/app/workers/builds.php
index d52329b107..315b13a179 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -106,11 +106,11 @@ class BuildsV1 extends Worker
         $build->setAttribute('status', 'building');
         $build = $dbForProject->updateDocument('builds', $buildId, $build);
 
-        $data = $deployment->getArrayCopy(array_keys($deploymentModel->getRules()));
-
         /** Trigger Webhook */
         $deploymentModel = new Deployment();
 
+        $data = $deployment->getArrayCopy(array_keys($deploymentModel->getRules()));
+
         $deploymentUpdate = new Event(Event::WEBHOOK_QUEUE_NAME, Event::WEBHOOK_CLASS_NAME);
         $deploymentUpdate
             ->setProject($project)
diff --git a/app/workers/functions.php b/app/workers/functions.php
index bad6e7d640..e0c9e64961 100644
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@@ -43,11 +43,11 @@ $execute = function (
     ?Document $user = null,
     string $jwt = null
 ) use ($executor, $register) {
-
     $user ??= new Document();
     $functionId = $function->getId();
     $deploymentId = $function->getAttribute('deployment', '');
 
+
     /** Check if deployment exists */
     $deployment = $dbForProject->getDocument('deployments', $deploymentId);
 
@@ -209,7 +209,7 @@ $execute = function (
 
     /** Trigger Functions */
     $functions
-        ->setData($data)
+        ->setData($data ?? '')
         ->setProject($project)
         ->setUser($user)
         ->setEvent('functions.[functionId].executions.[executionId].update')
@@ -333,7 +333,7 @@ $server->job()
                 $data = $args['data'] ?? '';
                 $execution = new Document($args['execution'] ?? []);
                 $user = new Document($args['user'] ?? []);
-                $function = $dbForProject->getDocument('functions', $execution->getAttribute('functionId'));
+                // $function = $dbForProject->getDocument('functions', $execution->getAttribute('functionId'));
                 call_user_func($execute, $project, $function, $dbForProject, $functions, 'http', $execution->getId(), null, null, $data, $user, $jwt);
                 break;
             case 'schedule':