diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/results_image.html b/wagtail/wagtailimages/templates/wagtailimages/images/results_image.html
index a782ffacb..49731bc72 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/results_image.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/results_image.html
@@ -1,4 +1,19 @@
+{% comment %}
+ Separated out of results.html to prevent invalid images from crashing the entire
+ images listing. (issue #1805)
+
+ If an error is raised inside a template include, the error is caught by the
+ calling {% include %} tag and the contents blanked out.
+
+ This behaviour caused a confusing error on the images listing view where it
+ would go blank if one of the images was invalid.
+
+ Separating the image rendering code into this file allows us to limit Django's
+ crash/blanking behaviour to a single image so the listing can still be used when
+ the issue occurs.
+{% endcomment %}
+
 {% load wagtailimages_tags wagtailadmin_tags %}
 {% load i18n %}
 
-<div class="image">{% image image max-165x165 class="show-transparency" %}</div>
\ No newline at end of file
+<div class="image">{% image image max-165x165 class="show-transparency" %}</div>