diff --git a/_includes/author_picture.html b/_includes/author_picture.html
index 438e524096..54eeba90dd 100644
--- a/_includes/author_picture.html
+++ b/_includes/author_picture.html
@@ -1,5 +1,11 @@
 {% if author.picture %}
-  {% if post.author %}
+  {% if author-id %}
+  <img
+    src="{{ site.baseurl }}/{{ author-id }}/{{ author.picture }}"
+    role="presentation"
+    alt="{{ author.name }}"
+  />
+  {% elsif post.author %}
   <img
     src="{{ site.baseurl }}/{{ post.author }}/{{ author.picture }}"
     role="presentation"
diff --git a/_includes/author_summary.html b/_includes/author_summary.html
index 4053735a4a..b90926f283 100644
--- a/_includes/author_summary.html
+++ b/_includes/author_summary.html
@@ -1,7 +1,7 @@
 {% assign author-id = include.author-id %}
 {% assign author = site.data.authors.authors[author-id] %}
 <div class="author-information cell">
-  <img src="{{ site.baseurl }}/{{ author-id }}/{{ author.picture }}" alt="{{ author.name }}"/>
+  {% include author_picture.html author-id=author-id %}
   <a rel="author" href="{{ site.baseurl }}/{{ author-id }}">{{ author.name }}</a>
 </div>
 <div class="cell">