diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 7b9cb10d514a..506bd87adc84 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -137,6 +137,11 @@ module.exports = React.createClass({
         const avatarUrl = this.props.room.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
             null, null, null, false);
+
+        if (!avatarUrl) {
+            return;
+        }
+
         const ImageView = sdk.getComponent("elements.ImageView");
         const params = {
             src: avatarUrl,