diff --git a/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsx b/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsx
index a71d808b389..403c21e94ba 100644
--- a/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsx
+++ b/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsx
@@ -62,11 +62,14 @@ export const DiskUsage = ({
: []
}, [isSuccess, projects, projectRef])
+ const hasReplicas = useMemo(
+ () => relevantProjects.some((it) => it.databases.some((db) => db.type === 'READ_REPLICA')),
+ [relevantProjects]
+ )
+
const hasProjectsExceedingDiskSize = useMemo(() => {
return relevantProjects.some((it) =>
- it.databases.some(
- (db) => db.type === 'READ_REPLICA' || (db.disk_volume_size_gb && db.disk_volume_size_gb > 8)
- )
+ it.databases.some((db) => db.disk_volume_size_gb && db.disk_volume_size_gb > 8)
)
}, [relevantProjects])
@@ -103,6 +106,19 @@ export const DiskUsage = ({
)}
+ {currentBillingCycleSelected &&
+ subscription?.usage_billing_enabled === false &&
+ !hasProjectsExceedingDiskSize &&
+ hasReplicas && (
+