diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 0def10bb56..88fe535b26 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -1007,7 +1007,7 @@ App::post('/v1/functions/:functionId/executions')
              */
             $queueForUsage
                 ->addMetric('executions.compute', (int)($executionResponse['duration'] * 1000))// per project
-                ->addMetric("{$function->getId()}" . ".executions.compute", (int)($executionResponse['duration'] * 1000))// per function
+                ->addMetric("{$function->getInternalId()}" . ".executions.compute", (int)($executionResponse['duration'] * 1000))// per function
             ;
 
         } catch (\Throwable $th) {
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index bfcf6f1a2e..4fc5b6aa64 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -74,7 +74,7 @@ $databaseListener = function (string $event, Document $document, Document $proje
 
                 //Project level sessions deduction
                 if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                    $sessions = count($document->getAttribute('sessions'));
+                    $sessions = count($document->getAttribute('sessions', 0));
                     if (!empty($sessions)) {
                         $queueForUsage
                             ->addMetric("sessions", ($sessions * -1)); // per project
@@ -102,7 +102,7 @@ $databaseListener = function (string $event, Document $document, Document $proje
                 break;
             case str_starts_with($document->getCollection(), 'database_') && !str_contains($document->getCollection(), 'collection'): //collections
                 $parts = explode('_', $document->getCollection());
-                $databaseId = $parts[1];
+                $databaseId = $parts[1] ?? 0;
                 $queueForUsage
                     ->addMetric("collections", $value) // per project
                     ->addMetric("{$databaseId}" . ".collections", $value) // per database
@@ -119,8 +119,8 @@ $databaseListener = function (string $event, Document $document, Document $proje
                 break;
             case str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_'): //documents
                 $parts = explode('_', $document->getCollection());
-                $databaseId   = $parts[1];
-                $collectionId = $parts[3];
+                $databaseId   = $parts[1] ?? 0;
+                $collectionId = $parts[3] ?? 0;
                 $queueForUsage
                     ->addMetric("documents", $value)  // per project
                     ->addMetric("{$databaseId}" . ".documents", $value) // per database
@@ -575,7 +575,7 @@ App::shutdown()
 
         if (
             $project->getId() !== 'console'
-            && $mode !== APP_MODE_ADMIN
+            //&& $mode !== APP_MODE_ADMIN
         ) {
             $fileSize = 0;
             $file = $request->getFiles('file');