diff --git a/src/components/Articles/Articles.js b/src/components/Articles/Articles.js
index 891a196..e07aeef 100644
--- a/src/components/Articles/Articles.js
+++ b/src/components/Articles/Articles.js
@@ -8,12 +8,15 @@ const Articles = ({ data: { edges }, limit = 6, setLimit = () => null }) => {
     <>
       <div className="articles">
         <div className="articles-content">
-          {edges.map(({ node }, i) => {
-            if (i < limit) {
-              return <ArticleCard key={i} data={node.frontmatter} />
-            }
-            return null
-          })}
+          {edges.length <= 0
+            ? <p>Записей нет</p>
+            : edges.map(({ node }, i) => {
+                if (i < limit) {
+                  return <ArticleCard key={i} data={node.frontmatter} />
+                }
+                return null
+              })
+          }
         </div>
         <div className="articles-loadMore">
           {edges.length === limit || edges.length <= limit 
diff --git a/src/components/Articles/MoreArticles/MoreArticles.js b/src/components/Articles/MoreArticles/MoreArticles.js
index 06019d5..0dc93a6 100644
--- a/src/components/Articles/MoreArticles/MoreArticles.js
+++ b/src/components/Articles/MoreArticles/MoreArticles.js
@@ -14,9 +14,9 @@ const MoreArticles = () => {
         <h2>Вам также может понравится...</h2>
       </div>
       <div className="more-articles__content">
-        {edges.map(({ node }, e) => {
-          if (node.frontmatter.slug !== query) {
-            return <ArticleCard key={e} data={node.frontmatter} />
+        {edges.filter(({ node }) => node.frontmatter.slug !== query).sort(() => Math.random() - 0.5).map(({ node }, i) => {
+          if (i < 4) {
+            return <ArticleCard key={i} data={node.frontmatter} />
           }
           return null
         })}
diff --git a/src/hooks/useMoreArticlesQuery.js b/src/hooks/useMoreArticlesQuery.js
index 837712b..450edeb 100644
--- a/src/hooks/useMoreArticlesQuery.js
+++ b/src/hooks/useMoreArticlesQuery.js
@@ -3,7 +3,7 @@ import { useStaticQuery, graphql } from 'gatsby'
 const useMoreArticlesQuery = () => {
   const { allMarkdownRemark: { edges } } = useStaticQuery(graphql`
     {
-      allMarkdownRemark(filter: {frontmatter: {templateKey: {eq: "article"}}}, limit: 4) {
+      allMarkdownRemark(filter: {frontmatter: {templateKey: {eq: "article"}}}, sort: {order: DESC, fields: frontmatter___date}, limit: 6) {
         edges {
           node {
             frontmatter {