diff --git a/gatsby-node.js b/gatsby-node.js
index b4c6f39..cb5c1a9 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -123,7 +123,7 @@ exports.onCreateNode = ({ node, boundActionCreators, getNode }) => {
       value: slug
     });
 
-    if (typeof node.frontmatter.tags !== 'undefined') {
+    if (node.frontmatter.tags) {
       const tagSlugs = node.frontmatter.tags.map(
         tag => `/tags/${_.kebabCase(tag)}/`
       );
diff --git a/src/components/PostTemplateDetails/index.jsx b/src/components/PostTemplateDetails/index.jsx
index 6620951..44192eb 100644
--- a/src/components/PostTemplateDetails/index.jsx
+++ b/src/components/PostTemplateDetails/index.jsx
@@ -19,7 +19,7 @@ class PostTemplateDetails extends React.Component {
     const tagsBlock = (
       <div className="post-single__tags">
         <ul className="post-single__tags-list">
-          {tags.map((tag, i) =>
+          {tags && tags.map((tag, i) =>
             <li className="post-single__tags-list-item" key={tag}>
               <Link to={tag} className="post-single__tags-list-item-link">
                 {post.frontmatter.tags[i]}