diff --git a/default.hbs b/default.hbs
index fb7be37..33ccfdf 100755
--- a/default.hbs
+++ b/default.hbs
@@ -16,7 +16,6 @@
 
         {{!--  TODO: REMOVE ON PRODUCTION! --}}
         <script type="text/javascript" src="http://livejs.com/live.js"></script>
-
         {{!-- Scripts End --}}
 
         {{!--  Begin Page-specific code --}}
diff --git a/page.hbs b/page.hbs
index cecf898..6de59d1 100644
--- a/page.hbs
+++ b/page.hbs
@@ -14,7 +14,10 @@
         {{#post}}
             <div class="mind-post_content">
                 <div class="mind-post_content-header">
+
+                {{#if feature_image}}
                     <img class="mind-post_feature-image" src="{{img_url feature_image size="l"}}" alt="Feature Image"/>
+                {{/if}}
                 </div>
                 {{content}}
             </div>
diff --git a/partials/post-card-big.hbs b/partials/post-card-big.hbs
index 55ff61c..630bbe9 100644
--- a/partials/post-card-big.hbs
+++ b/partials/post-card-big.hbs
@@ -1,6 +1,9 @@
 <article class="{{post_class}}">
   <a class="mind-post-card-big_main" href="{{url}}">
-    <img class="mind-post-card-big_feature-image" src="{{img_url feature_image size="m"}}"  alt="Feature Image"/>
+
+    {{#if feature_image}}
+        <img class="mind-post-card-big_feature-image" src="{{img_url feature_image size="m"}}"  alt="Feature Image"/>
+    {{/if}}
     <header class="mind-post-card-big_header">
       <p class="mind-post-card-big_meta"><span class="mind-post-card-big_tag">{{primary_tag.name}}</span>
         • <time class="post-date" datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMMM YYYY"}}</time></p>
diff --git a/partials/posts-card-small.hbs b/partials/posts-card-small.hbs
index 66bff15..ab2d4fb 100644
--- a/partials/posts-card-small.hbs
+++ b/partials/posts-card-small.hbs
@@ -3,7 +3,10 @@
   {{#foreach related}}
     <article class="{{post_class}}">
       <a class="mind-post-card-sidebar_main" href="{{url}}">
-        <img class="mind-post-card-sidebar_feature-image" src="{{img_url feature_image size="s"}}"  alt="Feature Image"/>
+
+        {{#if feature_image}}
+            <img class="mind-post-card-sidebar_feature-image" src="{{img_url feature_image size="s"}}"  alt="Feature Image"/>
+        {{/if}}
         <header class="mind-post-card-sidebar_header">
           <p class="mind-post-card-sidebar_meta"><span class="mind-post-card-sidebar_tag">{{primary_tag.name}}</span> • <time class="post-date" datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMMM YYYY"}}</time></p>
           <h5>{{title}}</h5>
diff --git a/partials/tag-card-big.hbs b/partials/tag-card-big.hbs
index 601e1e5..e723b47 100644
--- a/partials/tag-card-big.hbs
+++ b/partials/tag-card-big.hbs
@@ -1,8 +1,10 @@
 <article class="{{post_class}}">
-  <a class="mind-tag-card_main" href="{{url}}">
-    <img class="mind-tag-card_feature-image" src="{{img_url feature_image size="s"}}"  alt="Feature Image"/>
-    <header class="mind-tag-card_header">
-      <h4>{{name}}</h4>
-    </header>
-  </a>
+    <a class="mind-tag-card_main" href="{{url}}">
+        {{#if feature_image}}
+            <img class="mind-tag-card_feature-image" src="{{img_url feature_image size="s"}}"  alt="Feature Image"/>
+        {{/if}}
+        <header class="mind-tag-card_header">
+            <h4>{{name}}</h4>
+        </header>
+    </a>
 </article>
diff --git a/post.hbs b/post.hbs
index 5ad2ca5..7a693fb 100755
--- a/post.hbs
+++ b/post.hbs
@@ -18,7 +18,10 @@
       {{#post}}
       <div class="mind-post_content">
         <div class="mind-post_content-header">
-          <img class="mind-post_feature-image" src="{{img_url feature_image size="l"}}" alt="Feature Image"/>
+
+          {{#if feature_image}}
+              <img class="mind-post_feature-image" src="{{img_url feature_image size="l"}}" alt="Feature Image"/>
+          {{/if}}
         </div>
         {{content}}
         <hr>