diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index d6607461cf..c4f7ffe82e 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -470,7 +470,10 @@ module.exports = createReactClass({
             topic = `${topic.substring(0, MAX_TOPIC_LENGTH)}...`;
         }
         topic = linkifyAndSanitizeHtml(topic);
-
+        const avatarUrl = ContentRepo.getHttpUriForMxc(
+                                MatrixClientPeg.get().getHomeserverUrl(),
+                                room.avatar_url, 24, 24, "crop",
+                            );
         return (
             <tr key={ room.room_id }
                 onClick={() => this.onRoomClicked(room)}
@@ -480,15 +483,13 @@ module.exports = createReactClass({
                 <td className="mx_RoomDirectory_roomAvatar">
                     <BaseAvatar width={24} height={24} resizeMethod='crop'
                         name={ name } idName={ name }
-                        url={ ContentRepo.getHttpUriForMxc(
-                                MatrixClientPeg.get().getHomeserverUrl(),
-                                room.avatar_url, 24, 24, "crop") } />
+                        url={ avatarUrl } />
                 </td>
                 <td className="mx_RoomDirectory_roomDescription">
                     <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
                     <div className="mx_RoomDirectory_topic"
-                         onClick={ (ev) => { ev.stopPropagation(); } }
-                         dangerouslySetInnerHTML={{ __html: topic }} />
+                        onClick={ (ev) => { ev.stopPropagation(); } }
+                        dangerouslySetInnerHTML={{ __html: topic }} />
                     <div className="mx_RoomDirectory_alias">{ get_display_alias_for_room(room) }</div>
                 </td>
                 <td className="mx_RoomDirectory_roomMemberCount">