diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 376864e3bb..690287f279 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -207,10 +207,14 @@ App::init()
                 case 'buckets':
                     $usage->setParam('buckets.{scope}.count.total', -1);
                     break;
+                case 'deployments':
+                    $usage->setParam('deployments.{scope}.storage.size', -$document->getAttribute('size'));
+                    break;
                 default:
                     if (strpos($collection, 'buckets_') === 0) {
                         $usage
                             ->setParam('bucketId', $document->getAttribute('bucketId'))
+                            ->setParam('files.{scope}.storage.size', -$document->getAttribute('sizeOriginal'))
                             ->setParam('files.{scope}.count.total', -1);
                     } elseif (strpos($collection, 'database_') === 0) {
                         if (strpos($collection, '_collection_') != false) {
diff --git a/src/Appwrite/Usage/Stats.php b/src/Appwrite/Usage/Stats.php
index f8d16a13b9..3608b9491d 100644
--- a/src/Appwrite/Usage/Stats.php
+++ b/src/Appwrite/Usage/Stats.php
@@ -188,7 +188,7 @@ class Stats
         
         $deploymentSize = $this->params['deployment.{scope}.storage.size'] ?? 0;
         $storageSize = $this->params['files.{scope}.storage.size'] ?? 0;
-        if($deploymentSize + $storageSize) {
+        if($deploymentSize + $storageSize > 0) {
             $this->statsd->count('project.{scope}.storage.size' . $tags, $deploymentSize + $storageSize);
         }