diff --git a/src/controller.cpp b/src/controller.cpp
index 65dba38f1..724fbc1c2 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -471,7 +471,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
     User *localUser = connection->user();
     QString decoded = avatarSource.path();
     if (decoded.isEmpty()) {
-        connection->callApi<SetAvatarUrlJob>(localUser->id(), "");
+#ifdef QUOTIENT_07
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
+#else
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), QString());
+#endif
         return true;
     }
     if (QImageReader(decoded).read().isNull()) {
diff --git a/src/customemojimodel+network.cpp b/src/customemojimodel+network.cpp
index edc553f6a..d26b26545 100644
--- a/src/customemojimodel+network.cpp
+++ b/src/customemojimodel+network.cpp
@@ -63,7 +63,11 @@ void CustomEmojiModel::addEmoji(const QString& name, const QUrl& location)
             auto json = data != nullptr ? data->contentJson() : QJsonObject();
             auto emojiData = json["images"].toObject();
             emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
+#ifdef QUOTIENT_07
+                {QStringLiteral("url"), job->contentUri().toString()}
+#else
                 {QStringLiteral("url"), job->contentUri()}
+#endif
             });
             json["images"] = emojiData;
             d->conn->setAccountData("im.ponies.user_emotes", json);
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 36fb633f3..de4018381 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -477,7 +477,11 @@ void NeoChatRoom::changeAvatar(const QUrl &localFile)
     if (isJobRunning(job)) {
 #endif
         connect(job, &BaseJob::success, this, [this, job] {
+#ifdef QUOTIENT_07
+            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri().toString()}});
+#else
             connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
+#endif
         });
     }
 }
diff --git a/src/publicroomlistmodel.cpp b/src/publicroomlistmodel.cpp
index f72b197f7..643dc93c0 100644
--- a/src/publicroomlistmodel.cpp
+++ b/src/publicroomlistmodel.cpp
@@ -173,8 +173,11 @@ QVariant PublicRoomListModel::data(const QModelIndex &index, int role) const
         if (avatarUrl.isEmpty()) {
             return "";
         }
-
+#ifdef QUOTIENT_07
+        return avatarUrl.url().remove(0, 6);
+#else
         return avatarUrl.remove(0, 6);
+#endif
     }
     if (role == TopicRole) {
         return room.topic;
diff --git a/src/userdirectorylistmodel.cpp b/src/userdirectorylistmodel.cpp
index a01e9eb87..e1bcae511 100644
--- a/src/userdirectorylistmodel.cpp
+++ b/src/userdirectorylistmodel.cpp
@@ -126,8 +126,11 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
         if (avatarUrl.isEmpty()) {
             return "";
         }
-
+#ifdef QUOTIENT_07
+        return avatarUrl.url().remove(0, 6);
+#else
         return avatarUrl.remove(0, 6);
+#endif
     }
     if (role == UserIDRole) {
         return user.userId;