diff --git a/plugins/ImageEncoder/ImageEncoder.php b/plugins/ImageEncoder/ImageEncoder.php
index bb96104703..d3eaf2b658 100644
--- a/plugins/ImageEncoder/ImageEncoder.php
+++ b/plugins/ImageEncoder/ImageEncoder.php
@@ -185,11 +185,16 @@ class ImageEncoder extends Plugin
             return Event::next;
         }
 
+        if (\is_null($thumbnail = $vars['attachment']->getThumbnail())) {
+            return Event::next;
+        }
+
         $res[] = Formatting::twigRenderFile(
             'imageEncoder/imageEncoderView.html.twig',
             [
                 'attachment' => $vars['attachment'],
                 'note'       => $vars['note'],
+                'thumbnail'  => $thumbnail,
             ],
         );
         return Event::stop;
diff --git a/plugins/ImageEncoder/templates/imageEncoder/imageEncoderView.html.twig b/plugins/ImageEncoder/templates/imageEncoder/imageEncoderView.html.twig
index 489b14f13c..9922dbc08b 100644
--- a/plugins/ImageEncoder/templates/imageEncoder/imageEncoderView.html.twig
+++ b/plugins/ImageEncoder/templates/imageEncoder/imageEncoderView.html.twig
@@ -1,5 +1,4 @@
 <figure>
-    {% set thumbnail = attachment.getThumbnail() %}
     <img class="u-photo"
          alt="{{ attachment.getBestTitle(note) }}"
          src="{{ attachment.getThumbnailUrl() }}"