diff --git a/src/controllers/atoms/MemberAvatar.js b/src/controllers/atoms/MemberAvatar.js
index 5d93f99947..a94b4291a0 100644
--- a/src/controllers/atoms/MemberAvatar.js
+++ b/src/controllers/atoms/MemberAvatar.js
@@ -53,8 +53,8 @@ module.exports = {
     },
 
     getInitialState: function() {
-        var url = MatrixClientPeg.get().getAvatarUrlForMember(
-            this.props.member,
+        var url = this.props.member.getAvatarUrl(
+            MatrixClientPeg.get().getHomeserverUrl(),
             this.props.width,
             this.props.height,
             this.props.resizeMethod,
diff --git a/src/controllers/atoms/RoomAvatar.js b/src/controllers/atoms/RoomAvatar.js
index dc0ac82eb4..44048869ce 100644
--- a/src/controllers/atoms/RoomAvatar.js
+++ b/src/controllers/atoms/RoomAvatar.js
@@ -28,8 +28,8 @@ module.exports = {
     },
 
     avatarUrlForRoom: function(room) {
-        var url = MatrixClientPeg.get().getAvatarUrlForRoom(
-            room,
+        var url = room.getAvatarUrl(
+            MatrixClientPeg.get().getHomeserverUrl(),
             this.props.width, this.props.height, this.props.resizeMethod,
             false
         );