diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 202599fea9..2af973ae16 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -45,8 +45,8 @@ App::post('/v1/storage/buckets')
     ->desc('Create bucket')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
-    ->label('audits.resource', 'storage/buckets/{$id}')
     ->label('event', 'buckets.[bucketId].create')
+    ->label('audits.resource', 'storage/buckets/{$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'createBucket')
@@ -210,8 +210,8 @@ App::put('/v1/storage/buckets/:bucketId')
     ->desc('Update Bucket')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
-    ->label('audits.resource', 'storage/buckets/{$id}')
     ->label('event', 'buckets.[bucketId].update')
+    ->label('audits.resource', 'storage/buckets/{$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'updateBucket')
@@ -272,8 +272,8 @@ App::delete('/v1/storage/buckets/:bucketId')
     ->desc('Delete Bucket')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
-    ->label('audits.resource', 'storage/buckets/{$id}')
     ->label('event', 'buckets.[bucketId].delete')
+    ->label('audits.resource', 'storage/buckets/{$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'deleteBucket')
@@ -319,8 +319,8 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->desc('Create File')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
-    ->label('audits.resource', 'storage/files/{$id}')
     ->label('event', 'buckets.[bucketId].files.[fileId].create')
+    ->label('audits.resource', 'storage/files/{$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'createFile')
@@ -1264,8 +1264,8 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->desc('Update File')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
-    ->label('audits.resource','storage/files/{$id}')
     ->label('event', 'buckets.[bucketId].files.[fileId].update')
+    ->label('audits.resource', 'storage/files/{$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'updateFile')
@@ -1359,8 +1359,8 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->desc('Delete File')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
-    ->label('audits.resource','storage/files/{$id}')
     ->label('event', 'buckets.[bucketId].files.[fileId].delete')
+    ->label('audits.resource', 'storage/files/{$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'deleteFile')
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 5d4897fd72..619b98afd0 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -200,9 +200,11 @@ App::shutdown()
     ->inject('dbForProject')
     ->action(function (App $utopia, Request $request, Response $response, Document $project, Event $events, Audit $audits, Stats $usage, Delete $deletes, EventDatabase $database, string $mode, Database $dbForProject) {
 
+        $responsePayload = $response->getPayload();
+
         if (!empty($events->getEvent())) {
-            if (empty($events->getPayload())) {
-                $events->setPayload($response->getPayload());
+            if (empty($events->getPayload())){
+                $events->setPayload($responsePayload);
             }
             /**
              * Trigger functions.
@@ -268,7 +270,7 @@ App::shutdown()
         $resource = $route->getLabel('audits.resource','');
         if(!empty($resource)) {
             $audits->setParam('resource', $parseLabel(
-                    $response->getPayload(), $resource)
+                    $responsePayload, $resource)
             );
 
             foreach ($events->getParams() as $key => $value) {