diff --git a/js/views/attachment_view.js b/js/views/attachment_view.js
index f7f8afb7a..506e831d9 100644
--- a/js/views/attachment_view.js
+++ b/js/views/attachment_view.js
@@ -17,9 +17,8 @@
       tagName: 'img',
       initialize: function(objectUrl, contentType, blob) {
         loadImage(blob, autoOrientedCanvas => {
-          this.el.replaceWith(autoOrientedCanvas);
+          this.source = autoOrientedCanvas.toDataURL();
           this.render();
-          this.update();
         }, {
           orientation: true,
         });
@@ -31,7 +30,7 @@
         this.trigger('update');
       },
       render: function() {
-        if (!this.source) {
+        if (this.source == null) {
           return this;
         }
 
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 200e63986..6a0c6976b 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -568,10 +568,7 @@ span.status {
       background-color: #ccc;
     }
 
-    img,
-    canvas, /* used for auto-oriented images from `loadImage` */
-    audio,
-    video {
+    img, audio, video {
       max-width: 100%;
       max-height: 300px;
     }