diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 6cc492acf8..8045d43104 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -140,7 +141,6 @@ export default class extends React.Component {
     }
 
     onImageLoad() {
-        this.fixupHeight();
         this.props.onWidgetLoad();
     }
 
@@ -207,6 +207,7 @@ export default class extends React.Component {
                 });
             }).done();
         }
+        this.fixupHeight();
         this._afterComponentDidMount();
     }
 
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 3a412fc2e2..aaad5ba75e 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -40,7 +40,6 @@ export default class MStickerBody extends MImageBody {
     }
 
     _onImageLoad() {
-        this.fixupHeight();
         this.setState({
             placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
         });