diff --git a/_includes/archive-single.html b/_includes/archive-single.html
index 4285b29f..cd401676 100644
--- a/_includes/archive-single.html
+++ b/_includes/archive-single.html
@@ -11,7 +11,7 @@
     <a href="{{ base_path }}{{ post.url }}">
   {% endif %}
     <article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">
-      {% if include.type == "grid" %}
+      {% if include.type == "grid" and teaser != blank %}
         <div class="archive__item-teaser">
           <img src=
             {% if teaser contains "http" %}
@@ -23,7 +23,9 @@
         </div>
       {% endif %}
       <h2 class="archive__item-title" itemprop="headline">{% if post.id %}{{ post.title | markdownify | remove: "<p>" | remove: "</p>" }}{% else %}{{ post.title }}{% endif %}{% if post.link %}<i class="fa fa-star" aria-hidden="true"></i>{% endif %}</h2>
-      {% if site.read_time and post.read_time %}<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>{% endif %}
+      {% if post.read_time %}
+        <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
+      {% endif %}
       {% if post.excerpt %}<p class="archive__item-excerpt" itemprop="description">{{ post.excerpt | markdownify | strip_html | truncate: 160 }}</p>{% endif %}
     </article>
   </a>
diff --git a/_layouts/single.html b/_layouts/single.html
index d24688aa..961205d8 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -25,7 +25,9 @@ layout: default
       {% unless page.header.overlay_color or page.header.overlay_image %}
         <header>
           <h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>
-          {% if site.read_time and page.read_time %}<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>{% endif %}
+          {% if page.read_time %}
+            <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
+          {% endif %}
         </header>
       {% endunless %}