diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index cd104cce37..c00b62ecc8 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -245,6 +245,30 @@ export default class ImageView extends React.Component {
const event = this.props.mxEvent;
+ let info;
+ if (event) {
+ info = (
+
+
+
+ { event.sender ? event.sender.name : event.getSender() }
+ { metadata }
+
+
+ );
+ } else {
+ // If there is no event - we're viewing an avatar, we set
+ // an empty div here, since the panel uses space-between
+ // and we want the same placement of elements
+ info = (
+
+ );
+ }
+
return (
-
-
-
- { event.sender ? event.sender.name : event.getSender() }
- { metadata }
-
-
+ {info}