diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 525beb6e3e1e81604f22399cf7818a7dc6b79d50..968ca93691751781931e4a1959eb51db06fb0c02 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4953,6 +4953,8 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
 		return PTR_ERR(qf_inode);
 	}
 
+	/* Don't account quota for quota files to avoid recursion */
+	qf_inode->i_flags |= S_NOQUOTA;
 	err = dquot_enable(qf_inode, type, format_id, flags);
 	iput(qf_inode);