diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 4168b606..37823f02 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -131,7 +131,7 @@ class Domain(Base):
         backref=db.backref('manager_of'), lazy='dynamic')
     max_users = db.Column(db.Integer, nullable=False, default=-1)
     max_aliases = db.Column(db.Integer, nullable=False, default=-1)
-    max_quota_bytes = db.Column(db.BigInteger(), nullable=False, default=0)
+    max_quota_bytes = db.Column(db.Integer(), nullable=False, default=0)
     signup_enabled = db.Column(db.Boolean(), nullable=False, default=False)
 
     @property
@@ -307,8 +307,8 @@ class User(Base, Email):
     domain = db.relationship(Domain,
         backref=db.backref('users', cascade='all, delete-orphan'))
     password = db.Column(db.String(255), nullable=False)
-    quota_bytes = db.Column(db.BigInteger(), nullable=False, default=10**9)
-    quota_bytes_used = db.Column(db.BigInteger(), nullable=False, default=0)
+    quota_bytes = db.Column(db.Integer(), nullable=False, default=10**9)
+    quota_bytes_used = db.Column(db.Integer(), nullable=False, default=0)
     global_admin = db.Column(db.Boolean(), nullable=False, default=False)
     enabled = db.Column(db.Boolean(), nullable=False, default=True)
 
diff --git a/core/admin/migrations/versions/2335c80a6bc3_.py b/core/admin/migrations/versions/2335c80a6bc3_.py
index 43d03547..ac5c1e83 100644
--- a/core/admin/migrations/versions/2335c80a6bc3_.py
+++ b/core/admin/migrations/versions/2335c80a6bc3_.py
@@ -15,7 +15,7 @@ import sqlalchemy as sa
 
 
 def upgrade():
-    op.add_column('domain', sa.Column('max_quota_bytes', sa.BigInteger(), nullable=False, server_default='0'))
+    op.add_column('domain', sa.Column('max_quota_bytes', sa.Integer(), nullable=False, server_default='0'))
 
 
 def downgrade():
diff --git a/core/admin/migrations/versions/25fd6c7bcb4a_.py b/core/admin/migrations/versions/25fd6c7bcb4a_.py
index 6e89d2c3..cf9a0fc7 100644
--- a/core/admin/migrations/versions/25fd6c7bcb4a_.py
+++ b/core/admin/migrations/versions/25fd6c7bcb4a_.py
@@ -20,7 +20,7 @@ import sqlalchemy as sa
 
 def upgrade():
     with op.batch_alter_table('user') as batch:
-        batch.add_column(sa.Column('quota_bytes_used', sa.BigInteger(), nullable=False, server_default='0'))
+        batch.add_column(sa.Column('quota_bytes_used', sa.Integer(), nullable=False, server_default='0'))
 
 
 def downgrade():
diff --git a/core/admin/migrations/versions/ff0417f4318f_.py b/core/admin/migrations/versions/ff0417f4318f_.py
index 99411087..7c92f241 100644
--- a/core/admin/migrations/versions/ff0417f4318f_.py
+++ b/core/admin/migrations/versions/ff0417f4318f_.py
@@ -41,7 +41,7 @@ def upgrade():
         sa.Column('comment', sa.String(length=255), nullable=True),
         sa.Column('localpart', sa.String(length=80), nullable=False),
         sa.Column('password', sa.String(length=255), nullable=False),
-        sa.Column('quota_bytes', sa.BigInteger(), nullable=False),
+        sa.Column('quota_bytes', sa.Integer(), nullable=False),
         sa.Column('global_admin', sa.Boolean(), nullable=False),
         sa.Column('enable_imap', sa.Boolean(), nullable=False),
         sa.Column('enable_pop', sa.Boolean(), nullable=False),