diff --git a/src/Appwrite/Utopia/Response/Filters/V06.php b/src/Appwrite/Utopia/Response/Filters/V06.php
index f386edc6ad..4bbeccb83e 100644
--- a/src/Appwrite/Utopia/Response/Filters/V06.php
+++ b/src/Appwrite/Utopia/Response/Filters/V06.php
@@ -52,11 +52,11 @@ class V06 extends Filter {
                 break;
             
             case Response::MODEL_TEAM:
-                $parsedResponse = $content;
+                $parsedResponse = $this->parseTeam($content);
                 break;
 
             case Response::MODEL_TEAM_LIST:
-                $parsedResponse = $content['teams'];
+                $parsedResponse = $this->parseTeamList($content);
                 break;
 
             case Response::MODEL_MEMBERSHIP:
@@ -209,6 +209,24 @@ class V06 extends Filter {
         return $content;
     }
 
+    private function parseTeam(array $content)
+    {
+        $content['$collection'] = Database::SYSTEM_COLLECTION_TEAMS; 
+        $content['$permissions'] = [];
+        return $content;
+    }
+
+    private function parseTeamList(array $content)
+    {
+        $teams = $content['teams'];
+        $parsedResponse = [];
+        foreach($teams as $team) {
+            $parsedResponse[] = $this->parseTeam($team);
+        }
+        $content['teams'] = $parsedResponse;
+        return $content;
+    }
+
     private function parseLogList(array $content)
     {
         $logs = $content['logs'];
diff --git a/tests/unit/Utopia/Filters/V06Test.php b/tests/unit/Utopia/Filters/V06Test.php
index 97804acd32..5f680fc547 100644
--- a/tests/unit/Utopia/Filters/V06Test.php
+++ b/tests/unit/Utopia/Filters/V06Test.php
@@ -249,6 +249,53 @@ class V06Test extends TestCase
         $this->assertEquals($parsedResponse['sessions'][0]['geo']['country'], 'United States');
     }
 
+    public function testParseTeam()
+    {
+        $content = [
+            '$id' => '5ff45ef261829',
+            'name' => 'test',
+            'dateCreated' => 1592981250,
+            'sum' => 7
+        ];
+
+        $model = Response::MODEL_TEAM;
+        $parsedResponse = $this->filter->parse($content, $model);
+
+        $this->assertEquals($parsedResponse['$id'], '5ff45ef261829');
+        $this->assertEquals($parsedResponse['name'], 'test');
+        $this->assertEquals($parsedResponse['dateCreated'], 1592981250);
+        $this->assertEquals($parsedResponse['sum'], 7);
+        $this->assertEquals($parsedResponse['$collection'], 'teams');
+        $this->assertEquals($parsedResponse['$permissions'], []);
+    }
+
+    public function testParseTeamList()
+    {
+        $content = [
+            'sum' => 1,
+            'teams' => [
+                0 => [
+                    '$id' => '5ff45ef261829',
+                    'name' => 'test',
+                    'dateCreated' => 1592981250,
+                    'sum' => 7
+                ]
+            ]
+        ];
+
+        $model = Response::MODEL_TEAM_LIST;
+        $parsedResponse = $this->filter->parse($content, $model);
+
+        $this->assertEquals($parsedResponse['sum'], 1);
+        $this->assertEquals($parsedResponse['teams'][0]['$id'], '5ff45ef261829');
+        $this->assertEquals($parsedResponse['teams'][0]['name'], 'test');
+        $this->assertEquals($parsedResponse['teams'][0]['dateCreated'], 1592981250);
+        $this->assertEquals($parsedResponse['teams'][0]['sum'], 7);
+        $this->assertEquals($parsedResponse['teams'][0]['$collection'], 'teams');
+        $this->assertEquals($parsedResponse['teams'][0]['$permissions'], []);
+
+    }
+
     public function testParseToken()
     {
         $content = [