diff --git a/lib/client.js b/lib/client.js
index 0c7329ae5..18ed917f5 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -734,6 +734,8 @@ MatrixClient.prototype.getAvatarUrlForMember =
     var rawUrl = member.events.member.getContent().avatar_url;
     if (rawUrl) {
         return this._http.getHttpUriForMxc(rawUrl, width, height, resizeMethod);
+    } else {
+        return this._http.getIdenticonUri(member.userId, width, height);
     }
     return null;
 };