diff --git a/src/settings/components/general-settings/user-quota.tsx b/src/settings/components/general-settings/user-quota.tsx
index 7d44cc026..fd5743365 100644
--- a/src/settings/components/general-settings/user-quota.tsx
+++ b/src/settings/components/general-settings/user-quota.tsx
@@ -30,6 +30,13 @@ const UserQuota: FC<UserQuotaProps> = ({ mobileView }) => {
 		return -1;
 	}, [settings?.attrs?.zimbraMailQuota, used]);
 
+	const filledQuota = useMemo(() => {
+		if (quota === -1 || quota >= 100) {
+			return 100;
+		}
+		return quota;
+	}, [quota]);
+
 	const description = useMemo(() => {
 		switch (true) {
 			case !quota || quota < 0:
@@ -60,7 +67,7 @@ const UserQuota: FC<UserQuotaProps> = ({ mobileView }) => {
 	return mobileView ? (
 		<Container width="fit" padding={{ right: 'medium' }}>
 			<Tooltip label={description} placement="bottom">
-				<Quota fill={quota > 0 ? quota : 0} fillBackground={fillBackground} />
+				<Quota fill={filledQuota} fillBackground={fillBackground} />
 			</Tooltip>
 		</Container>
 	) : (
@@ -78,7 +85,7 @@ const UserQuota: FC<UserQuotaProps> = ({ mobileView }) => {
 				>
 					<Text>{description}</Text>
 				</Container>
-				<Quota fill={quota === -1 ? 100 : quota} fillBackground={fillBackground} />
+				<Quota fill={filledQuota} fillBackground={fillBackground} />
 			</Container>
 		</FormSubSection>
 	);