diff --git a/src/models/userlistmodel.cpp b/src/models/userlistmodel.cpp
index 74e405f0b..58a8a20ef 100644
--- a/src/models/userlistmodel.cpp
+++ b/src/models/userlistmodel.cpp
@@ -87,7 +87,11 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
         return memberId;
     }
     if (role == AvatarRole) {
+#if Quotient_VERSION_MINOR > 8
+        return m_currentRoom->member(memberId).avatarUrl();
+#else
         return m_currentRoom->memberAvatar(memberId).url();
+#endif
     }
     if (role == ObjectRole) {
         return QVariant::fromValue(memberId);
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 756e40e66..0d5d60158 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -135,7 +135,11 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             auto showNotification = [this, roomMemberEvent] {
                 QImage avatar_image;
                 if (roomMemberEvent && !member(roomMemberEvent->senderId()).avatarUrl().isEmpty()) {
+#if Quotient_VERSION_MINOR > 8
+                    avatar_image = member(roomMemberEvent->senderId()).avatar(128, 128, {});
+#else
                     avatar_image = memberAvatar(roomMemberEvent->senderId()).get(this->connection(), 128, [] {});
+#endif
                 } else {
                     qWarning() << "using this room's avatar";
                     avatar_image = avatar(128);
diff --git a/src/notificationsmanager.cpp b/src/notificationsmanager.cpp
index 6db99b1b9..7b7e80f11 100644
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -131,7 +131,11 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
 
         QImage avatar_image;
         if (!sender.avatarUrl().isEmpty()) {
+#if Quotient_VERSION_MINOR > 8
+            avatar_image = room->member(sender.id()).avatar(128, 128, {});
+#else
             avatar_image = room->memberAvatar(sender.id()).get(connection, 128, {});
+#endif
         } else {
             avatar_image = room->avatar(128);
         }