diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 7cc780ff9d..340547d17a 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -1943,16 +1943,16 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
         );
         if (\is_null($permissions)) {
             $permissions = [];
-            if (!empty($userId)) {
+            if (!empty($user->getId())) {
                 foreach ($allowedPermissions as $permission) {
-                    $permissions[] = (new Permission($permission, 'user', $userId))->toString();
+                    $permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
                 }
             }
         } else {
             foreach ($allowedPermissions as $permission) {
                 // Default any missing allowed permissions to the current user
-                if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($userId)) {
-                    $permissions[] = (new Permission($permission, 'user', $userId))->toString();
+                if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($user->getId())) {
+                    $permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
                 }
             }
         }
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index fe950fa26c..0cc140aeef 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -385,16 +385,16 @@ App::post('/v1/storage/buckets/:bucketId/files')
         );
         if (\is_null($permissions)) {
             $permissions = [];
-            if (!empty($userId)) {
+            if (!empty($user->getId())) {
                 foreach ($allowedPermissions as $permission) {
-                    $permissions[] = (new Permission($permission, 'user', $userId))->toString();
+                    $permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
                 }
             }
         } else {
             foreach ($allowedPermissions as $permission) {
                 // Default any missing allowed permissions to the current user
-                if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($userId)) {
-                    $permissions[] = (new Permission($permission, 'user', $userId))->toString();
+                if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($user->getId())) {
+                    $permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
                 }
             }
         }