diff --git a/packages/frontend/component/src/components/setting-components/storage-progess.tsx b/packages/frontend/component/src/components/setting-components/storage-progess.tsx
index 174b6c83d8..e5cb1c7053 100644
--- a/packages/frontend/component/src/components/setting-components/storage-progess.tsx
+++ b/packages/frontend/component/src/components/setting-components/storage-progess.tsx
@@ -68,7 +68,11 @@ export const StorageProgress = ({
       {upgradable ? (
         <Tooltip
           options={{ hidden: percent < 100 }}
-          content={t['com.affine.storage.maximum-tips']()}
+          content={
+            plan === 'Free'
+              ? t['com.affine.storage.maximum-tips']()
+              : t['com.affine.storage.maximum-tips.pro']()
+          }
         >
           <span tabIndex={0}>
             <Button
diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx
index 3df2cde6ad..2f148bae68 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx
@@ -8,6 +8,7 @@ import {
 import { Avatar } from '@affine/component/ui/avatar';
 import { Button } from '@affine/component/ui/button';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
+import { useUserQuota } from '@affine/core/hooks/use-quota';
 import {
   allBlobSizesQuery,
   removeAvatarMutation,
@@ -177,10 +178,13 @@ const StoragePanel = () => {
   const [subscription] = useUserSubscription();
   const plan = subscription?.plan ?? SubscriptionPlan.Free;
 
-  // TODO(@JimmFly): get limit from user usage query directly after #4720 is merged
+  const quota = useUserQuota();
   const maxLimit = useMemo(() => {
+    if (quota) {
+      return quota.storageQuota;
+    }
     return bytes.parse(plan === SubscriptionPlan.Free ? '10GB' : '100GB');
-  }, [plan]);
+  }, [plan, quota]);
 
   const setSettingModalAtom = useSetAtom(openSettingModalAtom);
   const onUpgrade = useCallback(() => {
diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.json
index 38da25994c..b99ad542b9 100644
--- a/packages/frontend/i18n/src/resources/en.json
+++ b/packages/frontend/i18n/src/resources/en.json
@@ -912,6 +912,7 @@
   "com.affine.storage.extend.hint": "The usage has reached its maximum capacity, AFFiNE Cloud is currently in early access phase and is not supported for upgrading, please be patient and wait for our pricing plan. ",
   "com.affine.storage.extend.link": "To get more information click here.",
   "com.affine.storage.maximum-tips": "You have reached the maximum capacity limit for your current account",
+  "com.affine.storage.maximum-tips.pro": "Pro users will have unlimited storage capacity during the alpha test period of the team version",
   "com.affine.storage.plan": "Plan",
   "com.affine.storage.title": "AFFiNE Cloud Storage",
   "com.affine.storage.upgrade": "Upgrade",