diff --git a/frontend/src/components/domains/DomainSummary.vue b/frontend/src/components/domains/DomainSummary.vue
index 6567459f5..27a6d60d2 100644
--- a/frontend/src/components/domains/DomainSummary.vue
+++ b/frontend/src/components/domains/DomainSummary.vue
@@ -14,11 +14,13 @@
     </v-row>
     <v-row>
       <v-col cols="6"><translate>Quota</translate></v-col>
-      <v-col cols="6">{{ domain.quota }} <translate>MB</translate></v-col>
+      <v-col cols="6" v-if="domain.quota === '0'"><translate>Unlimited</translate></v-col>
+      <v-col cols="6" v-else>{{ domain.quota }} <translate>MB</translate></v-col>
     </v-row>
     <v-row>
       <v-col cols="6"><translate>Default mailbox quota</translate></v-col>
-      <v-col cols="6">{{ domain.default_mailbox_quota }} MB</v-col>
+      <v-col cols="6" v-if="domain.default_mailbox_quota === '0'"><translate>Unlimited</translate></v-col>
+      <v-col cols="6" v-else>{{ domain.default_mailbox_quota }} MB</v-col>
     </v-row>
     <v-row v-if="domain.sending_limit !== undefined">
       <v-col cols="6"><translate>Daily sending limit</translate></v-col>
diff --git a/frontend/src/components/identities/AccountSummary.vue b/frontend/src/components/identities/AccountSummary.vue
index 16f78b8d6..ac3571872 100644
--- a/frontend/src/components/identities/AccountSummary.vue
+++ b/frontend/src/components/identities/AccountSummary.vue
@@ -32,7 +32,10 @@
     <template v-if="account.mailbox">
       <v-row>
         <v-col cols="6"><translate>Quota</translate></v-col>
-        <v-col cols="6">
+        <v-col cols="6" v-if="account.mailbox.quota === '0'">
+          <translate>Unlimited</translate>
+        </v-col>
+        <v-col cols="6" v-else>
           <v-progress-linear
             :color="account.mailbox.quota_usage < 80 ? 'primary' : 'warning'"
             :value="account.mailbox.quota_usage"