diff --git a/matrix_client/user.py b/matrix_client/user.py
index 193c0f2e..839d462b 100644
--- a/matrix_client/user.py
+++ b/matrix_client/user.py
@@ -38,7 +38,9 @@ def set_display_name(self, display_name):
 
     def get_avatar_url(self):
         mxcurl = self.api.get_avatar_url(self.user_id)
-        url = self.api.get_download_url(mxcurl)
+        url = None
+        if mxcurl is not None:
+            url = self.api.get_download_url(mxcurl)
         return url
 
     def set_avatar_url(self, avatar_url):