diff --git a/lib/TeamSpace/TeamSpaceService.php b/lib/TeamSpace/TeamSpaceService.php
index 969b780b2..7f37bafbe 100644
--- a/lib/TeamSpace/TeamSpaceService.php
+++ b/lib/TeamSpace/TeamSpaceService.php
@@ -233,7 +233,7 @@ public function getTeamSpaceForCircle(string $circleId): ?TeamFolder {
 
 		$this->createAppDirectory($folderId);
 
-		return new TeamFolder($folder->id, $folder->mountPoint);
+		return new TeamFolder($folder->id, $folder->mountPoint, $folder->quota);
 	}
 
 	/**
@@ -257,7 +257,7 @@ public function updateTeamSpaceQuota(string $circleId, int $quota): TeamFolder {
 			throw new \RuntimeException('Team space could not be found after updating quota');
 		}
 
-		return new TeamFolder($folder->id, $folder->mountPoint);
+		return new TeamFolder($folder->id, $folder->mountPoint, $quota);
 	}
 
 	/**
diff --git a/tests/TeamSpace/TeamSpaceServiceTest.php b/tests/TeamSpace/TeamSpaceServiceTest.php
index a2b6a99c8..cef66d756 100644
--- a/tests/TeamSpace/TeamSpaceServiceTest.php
+++ b/tests/TeamSpace/TeamSpaceServiceTest.php
@@ -18,6 +18,7 @@
 use OCP\Files\Cache\IScanner;
 use OCP\Files\Storage\IStorage;
 use OCP\Teams\Team;
+use OCP\Teams\TeamFolder;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
@@ -121,7 +122,11 @@ public function testGetTeamSpaceForCircleDoesNotRecreateExistingAppDirectory():
 		$storage->expects($this->never())->method('mkdir');
 		$storage->expects($this->never())->method('getScanner');
 
-		$this->assertSame(42, $this->service->getTeamSpaceForCircle('team-1')?->getId());
+		$folder = $this->service->getTeamSpaceForCircle('team-1');
+
+		$this->assertInstanceOf(TeamFolder::class, $folder);
+		$this->assertSame(42, $folder->getId());
+		$this->assertSame(0, $folder->getQuota());
 	}
 
 	public function testUnlinkKeepsFolderAndClearsTeamLink(): void {
@@ -150,6 +155,7 @@ public function testUpdateTeamSpaceQuotaReturnsUpdatedFolder(): void {
 
 		$this->assertSame(42, $folder->getId());
 		$this->assertSame('Engineering', $folder->getMountPoint());
+		$this->assertSame(1024, $folder->getQuota());
 	}
 
 	public function testGetGroupFoldersForCircleReturnsAllAssignedFolders(): void {