diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index a42e45c55d..b50b7a114c 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -161,7 +161,10 @@ export default class extends React.Component {
                 return this.state.decryptedThumbnailUrl;
             }
             return this.state.decryptedUrl;
-        } else if (content.info.mimetype == "image/svg+xml" && content.info.thumbnail_url) {
+        } else if (content.info &&
+                   content.info.mimetype == "image/svg+xml" &&
+                   content.info.thumbnail_url)
+        {
             // special case to return client-generated thumbnails for SVGs, if any,
             // given we deliberately don't thumbnail them serverside to prevent
             // billion lol attacks and similar